Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Port some of RuPara objects, part 1 #218

Merged
merged 5 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modular_ss220/aesthetics/_aesthetics.dme
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "safe\code\safe.dm"
#include "shutters\code\shutters.dm"
#include "soap\code\soap.dm"
#include "stamps\code\stamps.dm"
#include "surgery_table\code\surgery_table.dm"
#include "toolboxes\code\toolboxes.dm"
#include "wallcloset\code\wallcloset.dm"
Expand Down
82 changes: 82 additions & 0 deletions modular_ss220/aesthetics/stamps/code/stamps.dm
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'
)
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.
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.
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.
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 modular_ss220/aesthetics/stamps/icons/stamps.dmi
Binary file not shown.
54 changes: 52 additions & 2 deletions modular_ss220/aesthetics/zippo/code/zippo.dm
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 modified modular_ss220/aesthetics/zippo/icons/zippo.dmi
Binary file not shown.
4 changes: 4 additions & 0 deletions modular_ss220/objects/_objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@
new /datum/stack_recipe("reinforced plasteel platform", /obj/structure/platform/reinforced, 4, time = 40,one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("reinforced plasteel platform corner", /obj/structure/platform/reinforced/corner, 2, time = 30,one_per_turf = TRUE, on_floor = TRUE)
)

GLOB.wood_recipes += list(
new /datum/stack_recipe("tribune", /obj/structure/tribune, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE)
)
5 changes: 4 additions & 1 deletion modular_ss220/objects/_objects.dme
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"
76 changes: 76 additions & 0 deletions modular_ss220/objects/code/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,79 @@

/obj/structure/marker_beacon/spotlight/jade/update_icon_state()
set_light(light_range, light_power, LIGHT_COLOR_BLUEGREEN)

// Pamphlets
/obj/item/paper/pamphlet
name = "pamphlet"
desc = "A pamphlet that promotes something."
icon_state = "pamphlet"

// TODO: Write something
/obj/item/paper/pamphlet/deathsquad
name = "deathsquad pamphlet"
icon_state = "pamphlet-ds"

/obj/item/paper/pamphlet/gateway
info = "<b>Welcome to the Nanotrasen Gateway project...</b><br>\
Congratulations! If you're reading this, you and your superiors have decided that you're \
ready to commit to a life spent colonising the rolling hills of far away worlds. You \
must be ready for a lifetime of adventure, a little bit of hard work, and an award \
winning dental plan- but that's not all the Nanotrasen Gateway project has to offer.<br>\
<br>Because we care about you, we feel it is only fair to make sure you know the risks \
before you commit to joining the Nanotrasen Gateway project. All away destinations have \
been fully scanned by a Nanotrasen expeditionary team, and are certified to be 100% safe. \
We've even left a case of space beer along with the basic materials you'll need to expand \
Nanotrasen's operational area and start your new life.<br><br>\
<b>Gateway Operation Basics</b><br>\
All Nanotrasen approved Gateways operate on the same basic principals. They operate off \
area equipment power as you would expect, but they also require a backup wire with at least \
128, 000 Watts of power running through it. Without this supply, it cannot safely function \
and will reject all attempts at operation.<br><br>\
Once it is correctly setup, and once it has enough power to operate, the Gateway will begin \
searching for an output location. The amount of time this takes is variable, but the Gateway \
interface will give you an estimate accurate to the minute. Power loss will not interrupt the \
searching process. Influenza will not interrupt the searching process. Temporal anomalies \
may cause the estimate to be inaccurate, but will not interrupt the searching process.<br><br> \
<b>Life On The Other Side</b><br>\
Once you have traversed the Gateway, you may experience some disorientation. Do not panic. \
This is a normal side effect of travelling vast distances in a short period of time. You should \
survey the immediate area, and attempt to locate your complimentary case of space beer. Our \
expeditionary teams have ensured the complete safety of all away locations, but in a small \
number of cases, the Gateway they have established may not be immediately obvious. \
Do not panic if you cannot locate the return Gateway. Begin colonisation of the destination. \
<br><br><b>A New World</b><br>\
As a participant in the Nanotrasen Gateway Project, you will be on the frontiers of space. \
Though complete safety is assured, participants are advised to prepare for inhospitable \
environs."

// TODO: Rewrite text (update info and add map)
/obj/item/paper/pamphlet/deltainfo
name = "информационный буклет ИСН «Керберос»"
info = "<font face=\"Verdana\" color=black><center><H1>Буклет нового сотрудника \
на борту НСС &#34;Керберос&#34;</H1></center>\
<BR><HR><B></B><BR><center><H2>Цель</H2></center>\
<BR><font size=\"4\">Данное руководство было создано с целью \
<B>облегчить процесс</B> введения в работу станции <B>нового экипажа</B>, \
а также для <B>информирования сотрудников</B> об оптимальных маршрутах \
передвижения. В данном буклете находится <B>основная карта</B> &#34;Кербероса&#34; \
и несколько интересных фактов о станции.</font>\
<BR> За время строительства проект станции претерпел несколько значительных \
изменений. Изначально новая станция должна была стать туристическим объектом, \
но после произошедшей в <B>2549 году</B> серии <B>террористических актов</B> \
объект вошёл в состав парка научно-исследовательских станций корпорации. В \
нынешних технических туннелях до сих пор можно найти заброшенные комнаты для \
гостей, бары и клубы. В связи с плачевным состоянием несущих конструкций \
посещать эти части станции не рекомендуется, однако неиспользуемые площади \
могут быть использованы для строительства новых отсеков.\
<BR><HR><BR><center><H2>Особенности станции</H2></center>\
<BR>В отличие от большинства других научно-исследовательских станций Nanotrasen, \
таких как &#34;Кибериада&#34;, <B>ИСН &#34;Керборос&#34;</B> имеет менее \
жёсткую систему контроля за личными вещами экипажа. В частности, в отсеках \
были построены <B>дополнительные автолаты</B>, в том числе <B>публичные</B> \
(в карго и РНД). Также, благодаря более высокому бюджету, были возведены \
<B>новые отсеки</B>, такие как <B>ангар</B> или <B>склад</B> в отсеке РнД.\
Был расширен отдел <B>вирусологии</B> и возведены <B>новые техничесские туннели</B> для \
новых проектов.</font>"

/obj/item/paper/pamphlet/update_icon_state()
return
Loading