forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feat: Port some of RuPara objects, part 1 (#218)
<!-- By ticking or leaving ticked the option "Allow edits and access to secrets by maintainers" you give permission for repository maintainers to push changes to your branch without explicilty asking. --> <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## What Does This PR Do Добавляет: - Зиппо - Штампы (ооо бля... как это сделано я того маму) - Трибуны - Брошюры - Офисные игрушки - Статуя Дельты - Измельчитель ## Why It's Good For The Game ...) ## Images of changes не будет такого ## Testing да ## Changelog :cl: add: Порт некоторых предметов с РуПары (часть 1) /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> <!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->
- Loading branch information
Showing
33 changed files
with
709 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
// It's just works :skull: | ||
/obj/item/paper/stamp(obj/item/stamp/stamp) | ||
if(stamp.stampoverlay_custom_icon) | ||
stamps += (!stamps || stamps == "" ? "<HR>" : "") + "<img src=large_[stamp.icon_state].png>" | ||
var/image/stampoverlay = image(stamp.stampoverlay_custom_icon) | ||
var/x = rand(-2, 0) | ||
var/y = rand(-1, 2) | ||
offset_x += x | ||
offset_y += y | ||
stampoverlay.pixel_x = x | ||
stampoverlay.pixel_y = y | ||
stampoverlay.icon_state = "paper_[stamp.icon_state]" | ||
stamp_overlays += stampoverlay | ||
|
||
if(!ico) | ||
ico = new | ||
ico += "paper_[stamp.icon_state]" | ||
if(!stamped) | ||
stamped = new | ||
stamped += stamp.type | ||
|
||
update_icon(UPDATE_OVERLAYS) | ||
else | ||
. = ..() | ||
|
||
// TODO: Paperplane overlays code. Now there's no overlays at all on paperplanes because of /obj/item/paperplane/update_overlays() | ||
|
||
/obj/item/stamp | ||
var/stampoverlay_custom_icon | ||
|
||
/obj/item/stamp/warden | ||
name = "warden's rubber stamp" | ||
icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
icon_state = "stamp-ward" | ||
item_color = "hosred" | ||
stampoverlay_custom_icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
|
||
/obj/item/stamp/ploho | ||
name = "'Very Bad, Redo' rubber stamp" | ||
icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
icon_state = "stamp-ploho" | ||
item_color = "hop" | ||
stampoverlay_custom_icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
|
||
/obj/item/stamp/bigdeny | ||
name = "\improper BIG DENY rubber stamp" | ||
icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
icon_state = "stamp-BIGdeny" | ||
item_color = "redcoat" | ||
stampoverlay_custom_icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
|
||
/obj/item/stamp/navcom | ||
name = "Nanotrasen Naval Command rubber stamp" | ||
icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
icon_state = "stamp-navcom" | ||
item_color = "captain" | ||
stampoverlay_custom_icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
|
||
/obj/item/stamp/mime | ||
name = "mime's rubber stamp" | ||
icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
icon_state = "stamp-mime" | ||
item_color = "mime" | ||
stampoverlay_custom_icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
|
||
/obj/item/stamp/ussp | ||
name = "old USSP rubber stamp" | ||
icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
icon_state = "stamp-ussp" | ||
item_color = "redcoat" | ||
stampoverlay_custom_icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi' | ||
|
||
// Adding new stamps to the list | ||
/datum/asset/simple/paper/New() | ||
assets += list( | ||
"large_stamp-ward.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ward.png', | ||
"large_stamp-ploho.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ploho.png', | ||
"large_stamp-BIGdeny.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-BIGdeny.png', | ||
"large_stamp-navcom.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-navcom.png', | ||
"large_stamp-mime.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-mime.png', | ||
"large_stamp-ussp.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ussp.png' | ||
) |
Binary file added
BIN
+9.49 KB
modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-BIGdeny.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+825 Bytes
modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-mime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+20.9 KB
modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-navcom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.16 KB
modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ploho.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+22.3 KB
modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ussp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+8.18 KB
modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,53 @@ | ||
/obj/item/lighter/zippo | ||
/obj/item/lighter/zippo/cap | ||
name = "\improper Captain's zippo" | ||
desc = "A limited edition gold Zippo espesially for NT Captains. Looks extremely expensive." | ||
icon_state = "zippo-cap" | ||
item_state = "zippo-cap" | ||
icon = 'modular_ss220/aesthetics/zippo/icons/zippo.dmi' | ||
//TODO: give heads their zippos | ||
lefthand_file = 'modular_ss220/aesthetics/zippo/icons/items_lefthand.dmi' | ||
righthand_file = 'modular_ss220/aesthetics/zippo/icons/items_righthand.dmi' | ||
|
||
/obj/item/lighter/zippo/hop | ||
name = "\improper Head of Personnel's zippo" | ||
desc = "A limited edition Zippo for NT Heads. Tries it best to look like captain's." | ||
icon_state = "zippo-hop" | ||
item_state = "zippo-hop" | ||
icon = 'modular_ss220/aesthetics/zippo/icons/zippo.dmi' | ||
lefthand_file = 'modular_ss220/aesthetics/zippo/icons/items_lefthand.dmi' | ||
righthand_file = 'modular_ss220/aesthetics/zippo/icons/items_righthand.dmi' | ||
|
||
/obj/item/lighter/zippo/hos | ||
name = "\improper Head of Security's zippo" | ||
desc = "A limited edition Zippo for NT Heads. Fuel it with clown's tears." | ||
icon_state = "zippo-hos" | ||
item_state = "zippo-hos" | ||
icon = 'modular_ss220/aesthetics/zippo/icons/zippo.dmi' | ||
lefthand_file = 'modular_ss220/aesthetics/zippo/icons/items_lefthand.dmi' | ||
righthand_file = 'modular_ss220/aesthetics/zippo/icons/items_righthand.dmi' | ||
|
||
/obj/item/lighter/zippo/cmo | ||
name = "\improper Chief Medical Officer's zippo" | ||
desc = "A limited edition Zippo for NT Heads. Made of hypoallergenic steel." | ||
icon_state = "zippo-cmo" | ||
item_state = "zippo-cmo" | ||
icon = 'modular_ss220/aesthetics/zippo/icons/zippo.dmi' | ||
lefthand_file = 'modular_ss220/aesthetics/zippo/icons/items_lefthand.dmi' | ||
righthand_file = 'modular_ss220/aesthetics/zippo/icons/items_righthand.dmi' | ||
|
||
/obj/item/lighter/zippo/ce | ||
name = "\improper Chief Engineer's zippo" | ||
desc = "A limited edition Zippo for NT Heads. Somebody've tried to repair cover with blue tape." | ||
icon_state = "zippo-ce" | ||
item_state = "zippo-ce" | ||
icon = 'modular_ss220/aesthetics/zippo/icons/zippo.dmi' | ||
lefthand_file = 'modular_ss220/aesthetics/zippo/icons/items_lefthand.dmi' | ||
righthand_file = 'modular_ss220/aesthetics/zippo/icons/items_righthand.dmi' | ||
|
||
/obj/item/lighter/zippo/rd | ||
name = "\improper Research Director's zippo" | ||
desc = "A limited edition Zippo for NT Heads. Uses advanced tech to make fire from plasma." | ||
icon_state = "zippo-rd" | ||
item_state = "zippo-rd" | ||
icon = 'modular_ss220/aesthetics/zippo/icons/zippo.dmi' | ||
lefthand_file = 'modular_ss220/aesthetics/zippo/icons/items_lefthand.dmi' | ||
righthand_file = 'modular_ss220/aesthetics/zippo/icons/items_righthand.dmi' |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,7 @@ | ||
#include "_objects.dm" | ||
|
||
#include "code/platform.dm" | ||
#include "code/miscellaneous.dm" | ||
#include "code/officetoys.dm" | ||
#include "code/papershredder.dm" | ||
#include "code/platform.dm" | ||
#include "code/tribune.dm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.