diff --git a/GainStation13/code/clothing/haydee_suit.dm b/GainStation13/code/clothing/haydee_suit.dm index 348cb7f20a..25066765ff 100644 --- a/GainStation13/code/clothing/haydee_suit.dm +++ b/GainStation13/code/clothing/haydee_suit.dm @@ -17,7 +17,7 @@ anthro_mob_worn_overlay = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' icon_state = "haydee_suit1" item_state = "item_haydee" - armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 5, "acid" = 5) allowed = list(/obj/item/flashlight, /obj/item/tank/internals) actions_types = list(/datum/action/item_action/toggle_helmet) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/haydee diff --git a/GainStation13/code/game/lore_papers.dm b/GainStation13/code/game/lore_papers.dm index a879935823..82754112a1 100644 --- a/GainStation13/code/game/lore_papers.dm +++ b/GainStation13/code/game/lore_papers.dm @@ -549,3 +549,9 @@ "} + +//gs13 snack attack shuttle loan + +/obj/item/paper/fluff/chocoslime_research + name = "Stained Research Papers" + info = "AUDIO LOG OF CHOCOLATE SLIME REPORT NO.3. Despite possessing no obvious combat capabilities, the chocolate slime can feed itself to its victim, possibly rupturing its st-- mmhfph- grhm... ...(AUDIO LOG END)." diff --git a/GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm b/GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm new file mode 100644 index 0000000000..3a7c4bd880 --- /dev/null +++ b/GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm @@ -0,0 +1,27 @@ + + +/datum/round_event_control/vent_clog/fattening + name = "Clogged Vents: Fattening" + typepath = /datum/round_event/vent_clog/fattening + max_occurrences = 2 + min_players = 5 + description = "Spits out lipoifier foam through the scrubber system." + +/datum/round_event/vent_clog/fattening + reagentsAmount = 50 + +/datum/round_event/vent_clog/fattening/announce() + priority_announce("The scrubbers network is experiencing an unexpected surge of lipo-related chemicals. Some ejection of contents may occur.", "Atmospherics alert") + +/datum/round_event/vent_clog/fattening/start() + for(var/obj/machinery/atmospherics/components/unary/vent in vents) + if(vent && vent.loc && !vent.welded) + var/datum/reagents/R = new/datum/reagents(1000) + R.my_atom = vent + R.add_reagent(/datum/reagent/consumable/lipoifier, reagentsAmount) + + var/datum/effect_system/foam_spread/foam = new + foam.set_up(200, get_turf(vent), R) + foam.start() + CHECK_TICK + diff --git a/GainStation13/icons/effects/atmospherics.dmi b/GainStation13/icons/effects/atmospherics.dmi new file mode 100644 index 0000000000..16884f1da2 Binary files /dev/null and b/GainStation13/icons/effects/atmospherics.dmi differ diff --git a/GainStation13/icons/obj/barsigns.dmi b/GainStation13/icons/obj/barsigns.dmi new file mode 100644 index 0000000000..9ce18e94fb Binary files /dev/null and b/GainStation13/icons/obj/barsigns.dmi differ diff --git a/GainStation13/icons/obj/doors/1x2blast_hor.dmi b/GainStation13/icons/obj/doors/1x2blast_hor.dmi new file mode 100644 index 0000000000..a0a3d9351f Binary files /dev/null and b/GainStation13/icons/obj/doors/1x2blast_hor.dmi differ diff --git a/GainStation13/icons/obj/doors/1x2blast_vert.dmi b/GainStation13/icons/obj/doors/1x2blast_vert.dmi new file mode 100644 index 0000000000..6e810457d1 Binary files /dev/null and b/GainStation13/icons/obj/doors/1x2blast_vert.dmi differ diff --git a/GainStation13/icons/obj/doors/1x4blast_hor.dmi b/GainStation13/icons/obj/doors/1x4blast_hor.dmi new file mode 100644 index 0000000000..d43298973c Binary files /dev/null and b/GainStation13/icons/obj/doors/1x4blast_hor.dmi differ diff --git a/GainStation13/icons/obj/doors/1x4blast_vert.dmi b/GainStation13/icons/obj/doors/1x4blast_vert.dmi new file mode 100644 index 0000000000..26c730b983 Binary files /dev/null and b/GainStation13/icons/obj/doors/1x4blast_vert.dmi differ diff --git a/GainStation13/icons/obj/doors/Door2x1glassfull.dmi b/GainStation13/icons/obj/doors/Door2x1glassfull.dmi new file mode 100644 index 0000000000..8f8c66bdb6 Binary files /dev/null and b/GainStation13/icons/obj/doors/Door2x1glassfull.dmi differ diff --git a/GainStation13/icons/obj/doors/DoorHazard.dmi b/GainStation13/icons/obj/doors/DoorHazard.dmi new file mode 100644 index 0000000000..b8fac7cac9 Binary files /dev/null and b/GainStation13/icons/obj/doors/DoorHazard.dmi differ diff --git a/GainStation13/icons/obj/doors/Doorf.dmi b/GainStation13/icons/obj/doors/Doorf.dmi new file mode 100644 index 0000000000..040cdf77cb Binary files /dev/null and b/GainStation13/icons/obj/doors/Doorf.dmi differ diff --git a/GainStation13/icons/obj/doors/Doorfire.dmi b/GainStation13/icons/obj/doors/Doorfire.dmi new file mode 100644 index 0000000000..3b9f05cfa3 Binary files /dev/null and b/GainStation13/icons/obj/doors/Doorfire.dmi differ diff --git a/GainStation13/icons/obj/doors/Doorfireglass.dmi b/GainStation13/icons/obj/doors/Doorfireglass.dmi new file mode 100644 index 0000000000..f00e6c2857 Binary files /dev/null and b/GainStation13/icons/obj/doors/Doorfireglass.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi b/GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi new file mode 100644 index 0000000000..58be8d778e Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi new file mode 100644 index 0000000000..6bc8aae620 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi b/GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi new file mode 100644 index 0000000000..c034f8e282 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi new file mode 100644 index 0000000000..7ec3486053 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi new file mode 100644 index 0000000000..b34b73fb4e Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi b/GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi new file mode 100644 index 0000000000..cad0fe0ed0 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi b/GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi new file mode 100644 index 0000000000..1ed0d58dc4 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi new file mode 100644 index 0000000000..19920538d9 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi b/GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi new file mode 100644 index 0000000000..83c052c413 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi new file mode 100644 index 0000000000..5fb77f2676 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/external/color.dmi b/GainStation13/icons/obj/doors/airlocks/external/color.dmi new file mode 100644 index 0000000000..b286528da2 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/external/color.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/external/external.dmi b/GainStation13/icons/obj/doors/airlocks/external/external.dmi new file mode 100644 index 0000000000..d67fd5b8fd Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/external/external.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/external/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/external/overlays.dmi new file mode 100644 index 0000000000..1ccd15c582 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/external/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi b/GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi new file mode 100644 index 0000000000..9dbcb9d0f1 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi new file mode 100644 index 0000000000..04e7d7093c Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi b/GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi new file mode 100644 index 0000000000..bf48f8bdd6 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi b/GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi new file mode 100644 index 0000000000..ab5a192647 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi new file mode 100644 index 0000000000..affcbbf2ce Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi b/GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi new file mode 100644 index 0000000000..a43dce6a62 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi new file mode 100644 index 0000000000..2a6868c34b Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi new file mode 100644 index 0000000000..b2bb2cfa04 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi b/GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi new file mode 100644 index 0000000000..0e05597163 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/atmos.dmi b/GainStation13/icons/obj/doors/airlocks/station/atmos.dmi new file mode 100644 index 0000000000..aff111c9a3 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/atmos.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/bananium.dmi b/GainStation13/icons/obj/doors/airlocks/station/bananium.dmi new file mode 100644 index 0000000000..47fc565377 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/bananium.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/base.dmi b/GainStation13/icons/obj/doors/airlocks/station/base.dmi new file mode 100644 index 0000000000..4d62d12fba Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/base.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/color.dmi b/GainStation13/icons/obj/doors/airlocks/station/color.dmi new file mode 100644 index 0000000000..fd4de10aae Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/color.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/command.dmi b/GainStation13/icons/obj/doors/airlocks/station/command.dmi new file mode 100644 index 0000000000..265ea041b9 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/command.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/diamond.dmi b/GainStation13/icons/obj/doors/airlocks/station/diamond.dmi new file mode 100644 index 0000000000..1c30830644 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/diamond.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/divide.dmi b/GainStation13/icons/obj/doors/airlocks/station/divide.dmi new file mode 100644 index 0000000000..e3fa6a7e43 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/divide.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/engineering.dmi b/GainStation13/icons/obj/doors/airlocks/station/engineering.dmi new file mode 100644 index 0000000000..8da9536638 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/engineering.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/freezer.dmi b/GainStation13/icons/obj/doors/airlocks/station/freezer.dmi new file mode 100644 index 0000000000..f2f741347b Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/freezer.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/gold.dmi b/GainStation13/icons/obj/doors/airlocks/station/gold.dmi new file mode 100644 index 0000000000..490eefeeb9 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/gold.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi b/GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi new file mode 100644 index 0000000000..aff111c9a3 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi b/GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi new file mode 100644 index 0000000000..aff111c9a3 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/medbaydouble.dmi b/GainStation13/icons/obj/doors/airlocks/station/medbaydouble.dmi new file mode 100644 index 0000000000..38d6340af4 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/medbaydouble.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/medical.dmi b/GainStation13/icons/obj/doors/airlocks/station/medical.dmi new file mode 100644 index 0000000000..4dfbad5cb2 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/medical.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/mining.dmi b/GainStation13/icons/obj/doors/airlocks/station/mining.dmi new file mode 100644 index 0000000000..aff111c9a3 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/mining.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/station/overlays.dmi new file mode 100644 index 0000000000..0d128d91ba Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/overlaysdouble.dmi b/GainStation13/icons/obj/doors/airlocks/station/overlaysdouble.dmi new file mode 100644 index 0000000000..08986ddd4b Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/overlaysdouble.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/plasma.dmi b/GainStation13/icons/obj/doors/airlocks/station/plasma.dmi new file mode 100644 index 0000000000..99d44ef862 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/plasma.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/public.dmi b/GainStation13/icons/obj/doors/airlocks/station/public.dmi new file mode 100644 index 0000000000..aff111c9a3 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/public.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/research.dmi b/GainStation13/icons/obj/doors/airlocks/station/research.dmi new file mode 100644 index 0000000000..4dfbad5cb2 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/research.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi b/GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi new file mode 100644 index 0000000000..ef61df4c5c Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/science.dmi b/GainStation13/icons/obj/doors/airlocks/station/science.dmi new file mode 100644 index 0000000000..172c820538 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/science.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/security.dmi b/GainStation13/icons/obj/doors/airlocks/station/security.dmi new file mode 100644 index 0000000000..d949ed5dcd Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/security.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/securitydouble.dmi b/GainStation13/icons/obj/doors/airlocks/station/securitydouble.dmi new file mode 100644 index 0000000000..d60b41d1ef Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/securitydouble.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/silver.dmi b/GainStation13/icons/obj/doors/airlocks/station/silver.dmi new file mode 100644 index 0000000000..e7e6672fbf Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/silver.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/strip.dmi b/GainStation13/icons/obj/doors/airlocks/station/strip.dmi new file mode 100644 index 0000000000..0a148076e8 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/strip.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/uranium.dmi b/GainStation13/icons/obj/doors/airlocks/station/uranium.dmi new file mode 100644 index 0000000000..ac8c6d0611 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/uranium.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/virology.dmi b/GainStation13/icons/obj/doors/airlocks/station/virology.dmi new file mode 100644 index 0000000000..4dfbad5cb2 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/virology.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station/wood.dmi b/GainStation13/icons/obj/doors/airlocks/station/wood.dmi new file mode 100644 index 0000000000..7b7df10329 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station/wood.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station2/glass.dmi b/GainStation13/icons/obj/doors/airlocks/station2/glass.dmi new file mode 100644 index 0000000000..d474099785 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station2/glass.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi new file mode 100644 index 0000000000..1cf94b2e6a Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/survival/survival.dmi b/GainStation13/icons/obj/doors/airlocks/survival/survival.dmi new file mode 100644 index 0000000000..f6d8d3ce6b Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/survival/survival.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/survival/survival_overlays.dmi b/GainStation13/icons/obj/doors/airlocks/survival/survival_overlays.dmi new file mode 100644 index 0000000000..f8e62144cd Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/survival/survival_overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi b/GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi new file mode 100644 index 0000000000..f18346acf6 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi differ diff --git a/GainStation13/icons/obj/doors/airlocks/vault/vault.dmi b/GainStation13/icons/obj/doors/airlocks/vault/vault.dmi new file mode 100644 index 0000000000..d2ef5d4e46 Binary files /dev/null and b/GainStation13/icons/obj/doors/airlocks/vault/vault.dmi differ diff --git a/GainStation13/icons/obj/doors/blastdoor.dmi b/GainStation13/icons/obj/doors/blastdoor.dmi new file mode 100644 index 0000000000..30847afa87 Binary files /dev/null and b/GainStation13/icons/obj/doors/blastdoor.dmi differ diff --git a/GainStation13/icons/obj/doors/door_assembly.dmi b/GainStation13/icons/obj/doors/door_assembly.dmi new file mode 100644 index 0000000000..8812c0a421 Binary files /dev/null and b/GainStation13/icons/obj/doors/door_assembly.dmi differ diff --git a/GainStation13/icons/obj/doors/doorint.dmi b/GainStation13/icons/obj/doors/doorint.dmi new file mode 100644 index 0000000000..2abe5c7956 Binary files /dev/null and b/GainStation13/icons/obj/doors/doorint.dmi differ diff --git a/GainStation13/icons/obj/doors/doormorgue.dmi b/GainStation13/icons/obj/doors/doormorgue.dmi new file mode 100644 index 0000000000..c0ed114732 Binary files /dev/null and b/GainStation13/icons/obj/doors/doormorgue.dmi differ diff --git a/GainStation13/icons/obj/doors/edge_Doorfire.dmi b/GainStation13/icons/obj/doors/edge_Doorfire.dmi new file mode 100644 index 0000000000..3aad0114d4 Binary files /dev/null and b/GainStation13/icons/obj/doors/edge_Doorfire.dmi differ diff --git a/GainStation13/icons/obj/doors/mineral_doors.dmi b/GainStation13/icons/obj/doors/mineral_doors.dmi new file mode 100644 index 0000000000..03fab197fe Binary files /dev/null and b/GainStation13/icons/obj/doors/mineral_doors.dmi differ diff --git a/GainStation13/icons/obj/doors/shutters.dmi b/GainStation13/icons/obj/doors/shutters.dmi new file mode 100644 index 0000000000..816d1f94f9 Binary files /dev/null and b/GainStation13/icons/obj/doors/shutters.dmi differ diff --git a/GainStation13/icons/obj/doors/shutters_old.dmi b/GainStation13/icons/obj/doors/shutters_old.dmi new file mode 100644 index 0000000000..57ac75d251 Binary files /dev/null and b/GainStation13/icons/obj/doors/shutters_old.dmi differ diff --git a/GainStation13/icons/obj/doors/shutters_radiation.dmi b/GainStation13/icons/obj/doors/shutters_radiation.dmi new file mode 100644 index 0000000000..657b613b0c Binary files /dev/null and b/GainStation13/icons/obj/doors/shutters_radiation.dmi differ diff --git a/GainStation13/icons/obj/doors/shutters_window.dmi b/GainStation13/icons/obj/doors/shutters_window.dmi new file mode 100644 index 0000000000..c99790c6cf Binary files /dev/null and b/GainStation13/icons/obj/doors/shutters_window.dmi differ diff --git a/GainStation13/icons/obj/doors/windoor.dmi b/GainStation13/icons/obj/doors/windoor.dmi new file mode 100644 index 0000000000..86893eb9c4 Binary files /dev/null and b/GainStation13/icons/obj/doors/windoor.dmi differ diff --git a/GainStation13/icons/obj/halloween_items.dmi b/GainStation13/icons/obj/halloween_items.dmi new file mode 100644 index 0000000000..392ec60c35 Binary files /dev/null and b/GainStation13/icons/obj/halloween_items.dmi differ diff --git a/GainStation13/sound/voice/Approaching.ogg b/GainStation13/sound/voice/Approaching.ogg new file mode 100644 index 0000000000..28c895cb3c Binary files /dev/null and b/GainStation13/sound/voice/Approaching.ogg differ diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index f6979452ed..b8ab7ef2cc 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -43,7 +43,7 @@ /obj/machinery/door/airlock name = "airlock" - icon = 'icons/obj/doors/airlocks/station/public.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/public.dmi' //GS13 change (perspective sprites) icon_state = "closed" max_integrity = 300 var/normal_integrity = AIRLOCK_INTEGRITY_N @@ -87,8 +87,8 @@ var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to var/wiretypepath = /datum/wires/airlock // which set of per round randomized wires this airlock type has. var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass" - var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' - var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock + var/overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' + var/note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock var/cyclelinkeddir = 0 var/obj/machinery/door/airlock/cyclelinkedairlock @@ -611,22 +611,22 @@ /obj/machinery/door/airlock/proc/check_unres() //unrestricted sides. This overlay indicates which directions the player can access even without an ID if(hasPower() && unres_sides) if(unres_sides & NORTH) - var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") //layer=src.layer+1 + var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") //layer=src.layer+1 I.pixel_y = 32 set_light(l_range = 2, l_power = 1) add_overlay(I) if(unres_sides & SOUTH) - var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") //layer=src.layer+1 + var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") //layer=src.layer+1 I.pixel_y = -32 set_light(l_range = 2, l_power = 1) add_overlay(I) if(unres_sides & EAST) - var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") //layer=src.layer+1 + var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") //layer=src.layer+1 I.pixel_x = 32 set_light(l_range = 2, l_power = 1) add_overlay(I) if(unres_sides & WEST) - var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") //layer=src.layer+1 + var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") //layer=src.layer+1 I.pixel_x = -32 set_light(l_range = 2, l_power = 1) add_overlay(I) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 8cca3790e6..0822108a0f 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -2,23 +2,25 @@ Station Airlocks Regular */ +//GS13 - changed most of these airlock sprite paths to use perspective-oriented airlocks + /obj/machinery/door/airlock/abandoned abandoned = TRUE /obj/machinery/door/airlock/command - icon = 'icons/obj/doors/airlocks/station/command.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/command.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_com wiretypepath = /datum/wires/airlock/command normal_integrity = 450 /obj/machinery/door/airlock/security - icon = 'icons/obj/doors/airlocks/station/security.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/security.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_sec wiretypepath = /datum/wires/airlock/security normal_integrity = 450 /obj/machinery/door/airlock/engineering - icon = 'icons/obj/doors/airlocks/station/engineering.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/engineering.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_eng wiretypepath = /datum/wires/airlock/engineering @@ -26,13 +28,13 @@ abandoned = TRUE /obj/machinery/door/airlock/medical - icon = 'icons/obj/doors/airlocks/station/medical.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/medical.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_med wiretypepath = /datum/wires/airlock/medical /obj/machinery/door/airlock/maintenance name = "maintenance access" - icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mai normal_integrity = 250 @@ -41,18 +43,18 @@ /obj/machinery/door/airlock/maintenance/external name = "external airlock access" - icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_extmai /obj/machinery/door/airlock/mining name = "mining airlock" - icon = 'icons/obj/doors/airlocks/station/mining.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/mining.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_min wiretypepath = /datum/wires/airlock/cargo /obj/machinery/door/airlock/atmos name = "atmospherics airlock" - icon = 'icons/obj/doors/airlocks/station/atmos.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/atmos.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_atmo wiretypepath = /datum/wires/airlock/engineering @@ -60,22 +62,22 @@ abandoned = TRUE /obj/machinery/door/airlock/research - icon = 'icons/obj/doors/airlocks/station/research.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/research.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_research wiretypepath = /datum/wires/airlock/science /obj/machinery/door/airlock/freezer name = "freezer airlock" - icon = 'icons/obj/doors/airlocks/station/freezer.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/freezer.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_fre /obj/machinery/door/airlock/science - icon = 'icons/obj/doors/airlocks/station/science.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/science.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_science wiretypepath = /datum/wires/airlock/science /obj/machinery/door/airlock/virology - icon = 'icons/obj/doors/airlocks/station/virology.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/virology.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_viro wiretypepath = /datum/wires/airlock/medical @@ -179,7 +181,7 @@ /obj/machinery/door/airlock/gold name = "gold airlock" - icon = 'icons/obj/doors/airlocks/station/gold.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/gold.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_gold /obj/machinery/door/airlock/gold/glass @@ -188,7 +190,7 @@ /obj/machinery/door/airlock/silver name = "silver airlock" - icon = 'icons/obj/doors/airlocks/station/silver.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/silver.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_silver /obj/machinery/door/airlock/silver/glass @@ -197,7 +199,7 @@ /obj/machinery/door/airlock/diamond name = "diamond airlock" - icon = 'icons/obj/doors/airlocks/station/diamond.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/diamond.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_diamond normal_integrity = 1000 explosion_block = 2 @@ -209,7 +211,7 @@ /obj/machinery/door/airlock/uranium name = "uranium airlock" - icon = 'icons/obj/doors/airlocks/station/uranium.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/uranium.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_uranium var/last_event = 0 @@ -231,7 +233,7 @@ /obj/machinery/door/airlock/plasma name = "plasma airlock" desc = "No way this can end badly." - icon = 'icons/obj/doors/airlocks/station/plasma.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/plasma.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_plasma /obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) @@ -272,7 +274,7 @@ /obj/machinery/door/airlock/bananium name = "bananium airlock" desc = "Honkhonkhonk" - icon = 'icons/obj/doors/airlocks/station/bananium.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/bananium.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_bananium doorOpen = 'sound/items/bikehorn.ogg' @@ -282,7 +284,7 @@ /obj/machinery/door/airlock/sandstone name = "sandstone airlock" - icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_sandstone /obj/machinery/door/airlock/sandstone/glass @@ -291,7 +293,7 @@ /obj/machinery/door/airlock/wood name = "wooden airlock" - icon = 'icons/obj/doors/airlocks/station/wood.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/wood.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_wood /obj/machinery/door/airlock/wood/glass @@ -301,8 +303,8 @@ /obj/machinery/door/airlock/titanium name = "shuttle airlock" assemblytype = /obj/structure/door_assembly/door_assembly_titanium - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' normal_integrity = 400 /obj/machinery/door/airlock/titanium/glass @@ -312,8 +314,8 @@ /obj/machinery/door/airlock/bronze name = "bronze airlock" - icon = 'icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi' - overlays_file = 'icons/obj/doors/airlocks/clockwork/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_bronze /obj/machinery/door/airlock/bronze/seethru @@ -327,8 +329,8 @@ */ /obj/machinery/door/airlock/public - icon = 'icons/obj/doors/airlocks/station2/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_public /obj/machinery/door/airlock/public/glass @@ -356,9 +358,9 @@ /obj/machinery/door/airlock/external name = "external airlock" - icon = 'icons/obj/doors/airlocks/external/external.dmi' - overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' - note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/external/external.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' + note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_ext /obj/machinery/door/airlock/external/glass @@ -371,16 +373,16 @@ */ /obj/machinery/door/airlock/centcom //Use grunge as a station side version, as these have special effects related to them via phobias and such. - icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' - overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_centcom normal_integrity = 1000 security_level = 6 explosion_block = 2 /obj/machinery/door/airlock/grunge - icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' - overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_grunge /obj/machinery/door/airlock/grunge/abandoned @@ -393,8 +395,8 @@ /obj/machinery/door/airlock/vault name = "vault door" - icon = 'icons/obj/doors/airlocks/vault/vault.dmi' - overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/vault/vault.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_vault wiretypepath = /datum/wires/airlock/secure explosion_block = 2 @@ -408,16 +410,16 @@ /obj/machinery/door/airlock/hatch name = "airtight hatch" - icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' - overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_hatch /obj/machinery/door/airlock/maintenance_hatch name = "maintenance hatch" - icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' - overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mhatch /obj/machinery/door/airlock/maintenance_hatch/abandoned @@ -430,8 +432,8 @@ /obj/machinery/door/airlock/highsecurity name = "high tech security airlock" - icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' - overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity explosion_block = 2 normal_integrity = 500 @@ -445,8 +447,8 @@ /obj/machinery/door/airlock/shuttle name = "shuttle airlock" - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_shuttle /obj/machinery/door/airlock/shuttle/glass @@ -456,10 +458,10 @@ /obj/machinery/door/airlock/abductor name = "alien airlock" desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?" - icon = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' - overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_abductor - note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' damage_deflection = 30 explosion_block = 3 hackProof = TRUE @@ -474,8 +476,8 @@ /obj/machinery/door/airlock/cult name = "cult airlock" - icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' - overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_cult hackProof = TRUE aiControlDisabled = 1 @@ -524,8 +526,8 @@ return FALSE /obj/machinery/door/airlock/cult/proc/conceal() - icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' - overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' name = "airlock" desc = "It opens and closes." stealthy = TRUE @@ -556,8 +558,8 @@ friendly = TRUE /obj/machinery/door/airlock/cult/unruned - icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' - overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned @@ -699,8 +701,8 @@ /obj/machinery/door/airlock/glass_large name = "large glass airlock" - icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' - overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' + icon = 'GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi' + overlays_file = 'GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi' opacity = 0 assemblytype = null glass = TRUE diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 63ead98b61..949be30452 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -1,7 +1,7 @@ /obj/machinery/door/poddoor name = "blast door" desc = "A heavy duty blast door that opens mechanically." - icon = 'icons/obj/doors/blastdoor.dmi' + icon = 'GainStation13/icons/obj/doors/blastdoor.dmi' //GS13 icon_state = "closed" var/id = 1 layer = BLASTDOOR_LAYER diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 323fab4cf2..53e761bce8 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -2,7 +2,7 @@ gender = PLURAL name = "shutters" desc = "Mechanical metal shutters operated by a button with a magnetic seal, keeping them airtight." - icon = 'icons/obj/doors/shutters.dmi' + icon = 'GainStation13/icons/obj/doors/shutters.dmi' //GS13 layer = SHUTTER_LAYER closingLayer = SHUTTER_LAYER armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 75, BOMB = 25, BIO = 100, RAD = 100, FIRE = 100, ACID = 70) @@ -22,7 +22,7 @@ /obj/machinery/door/poddoor/shutters/old name = "strong shutters" desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions." - icon = 'icons/obj/doors/shutters_old.dmi' + icon = 'GainStation13/icons/obj/doors/shutters_old.dmi' //GS13 icon_state = "closed" armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 75, BOMB = 30, BIO = 100, RAD = 100, FIRE = 100, ACID = 70) max_integrity = 300 @@ -37,7 +37,7 @@ /obj/machinery/door/poddoor/shutters/radiation name = "radiation shutters" desc = "Lead-lined shutters painted yellow with a radioactive hazard symbol on it. Blocks out most radiation" - icon = 'icons/obj/doors/shutters_radiation.dmi' + icon = 'GainStation13/icons/obj/doors/shutters_radiation.dmi' //GS13 icon_state = "closed" rad_insulation = 0.2 @@ -60,7 +60,7 @@ /obj/machinery/door/poddoor/shutters/window name = "windowed shutters" desc = "Mechanical shutters that have some form of plastic window in them, allowing you to see through the shutters at all times." - icon = 'icons/obj/doors/shutters_window.dmi' + icon = 'GainStation13/icons/obj/doors/shutters_window.dmi' //GS13 icon_state = "closed" opacity = 0 glass = 1 diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 7033284a86..933ca0b1f8 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -277,25 +277,25 @@ icon_state = "salt_pile" gender = NEUTER -/obj/effect/decal/cleanable/glitter +/obj/effect/decal/cleanable/glitter //GS13 - changed glitters to more subtle variants name = "generic glitter pile" desc = "The herpes of arts and crafts." - icon = 'icons/effects/atmospherics.dmi' + icon = 'GainStation13/icons/effects/atmospherics.dmi' + icon_state = "glitter" gender = NEUTER mergeable_decal = TRUE persistent = FALSE /obj/effect/decal/cleanable/glitter/pink name = "pink glitter" - icon_state = "plasma_old" + color = "#9e0089" /obj/effect/decal/cleanable/glitter/white name = "white glitter" - icon_state = "nitrous_oxide_old" /obj/effect/decal/cleanable/glitter/blue name = "blue glitter" - icon_state = "freon_old" + color = "#2dd6ff" /obj/effect/decal/cleanable/plasma name = "stabilized plasma" diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index 0740f09d1d..0e834da988 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -291,6 +291,11 @@ icon = "thehive" desc = "Comb in for some sweet drinks! Not known for serving any sappy drink." +/datum/barsign/the_busted_belt //gs13 + name = "The Busted Belt" + icon = "thebustedbelt" + desc = "GATO is not liable for any pieces of broken wardrobe." + /datum/barsign/hiddensigns hidden = TRUE diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index ba854e7ec2..5710a17c86 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -160,6 +160,7 @@ buildstacktype = null //Custom mats handle this /obj/structure/chair/wood + icon = 'GainStation13/icons/obj/chairs.dmi' icon_state = "wooden_chair" name = "wooden chair" desc = "Old is never too old to not be in fashion." @@ -539,6 +540,7 @@ /obj/item/chair/wood name = "wooden chair" + icon = 'GainStation13/icons/obj/chairs.dmi' icon_state = "wooden_chair_toppled" item_state = "woodenchair" resistance_flags = FLAMMABLE diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm index a7758a591a..6dc62c6078 100644 --- a/code/modules/events/anomaly_pyro.dm +++ b/code/modules/events/anomaly_pyro.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/anomaly/anomaly_pyro min_players = 10 //GS13 tweak - max_occurrences = 5 + max_occurrences = 0 weight = 20 description = "This anomaly sets things on fire, and creates a pyroclastic slime." diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 11170bb2ed..22060aa109 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -2,7 +2,8 @@ name = "Spontaneous Brain Trauma" typepath = /datum/round_event/brain_trauma weight = 25 - min_players = 8 //GS13 - somewhat harmless ig + min_players = 20 //GS13 - somewhat harmless ig + max_occurrences = 0 category = EVENT_CATEGORY_HEALTH description = "A crewmember gains a random trauma." diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index cab9daaa55..dbbb0c01b1 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -4,7 +4,7 @@ weight = 5 min_players = 15 - max_occurrences = 1 + max_occurrences = 0 category = EVENT_CATEGORY_AI description = "Vending machines will attack people until the Patient Zero is disabled." diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index fc9031fc6a..b616c72272 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -1,7 +1,7 @@ /datum/round_event_control/disease_outbreak name = "Disease Outbreak" typepath = /datum/round_event/disease_outbreak - max_occurrences = 3 + max_occurrences = 0 min_players = 5 weight = 5 category = EVENT_CATEGORY_HEALTH diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 19927b9bd6..b854b2f03c 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -1,15 +1,16 @@ /datum/round_event_control/electrical_storm name = "Electrical Storm" typepath = /datum/round_event/electrical_storm - earliest_start = 20 MINUTES + earliest_start = 30 MINUTES min_players = 5 weight = 40 + max_occurrences = 2 category = EVENT_CATEGORY_ENGINEERING description = "Destroys all lights in a large area." /datum/round_event/electrical_storm var/lightsoutAmount = 1 - var/lightsoutRange = 25 + var/lightsoutRange = 10 announce_when = 1 /datum/round_event/electrical_storm/announce(fake) diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm index 5bf842ba47..ccc6affd11 100644 --- a/code/modules/events/mice_migration.dm +++ b/code/modules/events/mice_migration.dm @@ -6,8 +6,8 @@ description = "A horde of mice arrives, and perhaps even the Rat King themselves." /datum/round_event/mice_migration - var/minimum_mice = 5 - var/maximum_mice = 15 + var/minimum_mice = 3 + var/maximum_mice = 8 /datum/round_event/mice_migration/announce(fake) var/cause = pick("space-winter", "budget-cuts", "Ragnarok", diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 7de9629530..cd53390577 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -1,12 +1,13 @@ -#define HIJACK_SYNDIE 1 -#define RUSKY_PARTY 2 -#define SPIDER_GIFT 3 -#define DEPARTMENT_RESUPPLY 4 -#define ANTIDOTE_NEEDED 5 -#define PIZZA_DELIVERY 6 -#define ITS_HIP_TO 7 -#define MY_GOD_JC 8 -#define DELTA_CRATES 9 +#define SNACK_ATTACK 1 //GS13 +#define HIJACK_SYNDIE 2 +#define RUSKY_PARTY 3 +#define SPIDER_GIFT 4 +#define DEPARTMENT_RESUPPLY 5 +#define ANTIDOTE_NEEDED 6 +#define PIZZA_DELIVERY 7 +#define ITS_HIP_TO 8 +#define MY_GOD_JC 9 +#define DELTA_CRATES 10 /datum/round_event_control/shuttle_loan name = "Shuttle Loan" @@ -32,6 +33,9 @@ var/message = "Cargo: I just wanna tell you techs good luck, we are all counting on you." var/title = "CentCom Free Real Estate" switch(dispatch_type) + if(SNACK_ATTACK) //GS13 + message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?" + title = "CentCom Science Division" if(HIJACK_SYNDIE) message = "Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache." title = "CentCom Counter Intelligence" @@ -81,6 +85,8 @@ SSshuttle.supply.setTimer(3000) switch(dispatch_type) + if(SNACK_ATTACK) //GS13 + SSshuttle.centcom_message += "Snack attack en route." if(HIJACK_SYNDIE) SSshuttle.centcom_message += "Syndicate hijack team incoming." if(RUSKY_PARTY) @@ -125,6 +131,19 @@ var/list/shuttle_spawns = list() switch(dispatch_type) + if(SNACK_ATTACK) //GS13 + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast) + if(prob(50)) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast) + + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange) + shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research) if(HIJACK_SYNDIE) var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/emergency/specialops] pack.generate(pick_n_take(empty_shuttle_turfs)) diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index 117a188af8..f787258f20 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -34,7 +34,7 @@ /mob/living/simple_animal/jacq name = "Jacqueline the Pumpqueen" real_name = "Jacqueline" - icon = 'icons/obj/halloween_items.dmi' + icon = 'GainStation13/icons/obj/halloween_items.dmi' icon_state = "jacqueline" maxHealth = 25 health = 25 diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index b3811b8fef..569be84119 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -493,7 +493,7 @@ if(!arrivals_docked) var/atom/movable/screen/splash/Spl = new(character.client, TRUE) Spl.Fade(TRUE) - character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25) + character.playsound_local(get_turf(character), 'GainStation13/sound/voice/Approaching.ogg', 25) //GS13 - "now approaching, general station 13" job.standard_assign_skills(character.mind) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm index ff4a7d2bba..85ae2b7440 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm @@ -66,7 +66,7 @@ if(mob_size == MOB_SIZE_LARGE) cuff_icon += "_[caste]" - dmi_file = 'icons/mob/alienqueen.dmi' + dmi_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites var/mutable_appearance/cuffs = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER) cuffs.color = handcuffed.color diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index a5ef90f283..ab09517feb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -1,6 +1,6 @@ /mob/living/carbon/alien/humanoid/royal //Common stuffs for Praetorian and Queen - icon = 'icons/mob/alienqueen.dmi' + icon = 'hyperstation/icons/mobs/alienqueen.dmi' status_flags = 0 unique_name = 0 pixel_x = -16 @@ -17,7 +17,7 @@ meleeSlashHumanPower = 30 meleeSlashSAPower = 60 - var/alt_inhands_file = 'icons/mob/alienqueen.dmi' + var/alt_inhands_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites /mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE) return FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index a620c9a58b..5a93462e28 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -145,7 +145,7 @@ /mob/living/simple_animal/hostile/alien/queen/large name = "alien empress" - icon = 'icons/mob/alienqueen.dmi' + icon = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites icon_state = "alienq" icon_living = "alienq" icon_dead = "alienq_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index adca93e70f..7be9d099a9 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -27,7 +27,7 @@ spacewalk = TRUE var/armored = FALSE - obj_damage = 60 + obj_damage = 20 melee_damage_lower = 15 // i know it's like half what it used to be, but bears cause bleeding like crazy now so it works out melee_damage_upper = 15 wound_bonus = -5 diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 283ee5ad95..e858431db6 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -228,7 +228,6 @@ /obj/item/clothing/under/costume/basil_boys = 20, /obj/item/clothing/head/basil_boys = 20, /obj/item/clothing/shoes/basil_boys = 20, - /* Commenting out until next Christmas or made automatic /obj/item/clothing/accessory/sweater/uglyxmas = 3, /obj/item/clothing/under/costume/christmas = 3, /obj/item/clothing/under/costume/christmas/green = 3, @@ -242,7 +241,6 @@ /obj/item/clothing/shoes/winterboots/christmasbootsr = 3, /obj/item/clothing/shoes/winterboots/christmasbootsg = 3, /obj/item/clothing/shoes/winterboots/santaboots = 3, - */ /obj/item/clothing/head/cowboyhat = 3, /obj/item/clothing/head/cowboyhat/black = 3, /obj/item/clothing/head/cowboyhat/white = 3, @@ -269,6 +267,7 @@ /obj/item/clothing/suit/vapeshirt = 2, /obj/item/clothing/under/costume/geisha = 4, /obj/item/clothing/under/misc/keyholesweater = 3, + /obj/item/clothing/suit/space/hardsuit/engine/haydee = 1, //GS13 /obj/item/clothing/under/misc/staffassistant = 5) premium = list(/obj/item/clothing/under/suit/checkered = 4, /obj/item/clothing/head/mailman = 2, diff --git a/hyperstation/icons/mobs/alienqueen.dmi b/hyperstation/icons/mobs/alienqueen.dmi new file mode 100644 index 0000000000..4c04e0e4bf Binary files /dev/null and b/hyperstation/icons/mobs/alienqueen.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 58dd6e9fc3..fafa876227 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -212,3 +212,20 @@ /datum/gear/head/kabuto name = "Kabuto helmet" path = /obj/item/clothing/head/kabuto + +//GS13 +// /datum/gear/head/rose +// name = "Rose" +// path = /obj/item/grown/rose + +/datum/gear/head/sunflower + name = "Sunflower" + path = /obj/item/grown/sunflower + +/datum/gear/head/poppy + name = "Poppy" + path = /obj/item/reagent_containers/food/snacks/grown/poppy + +/datum/gear/head/harebell + name = "Harebell" + path = /obj/item/reagent_containers/food/snacks/grown/harebell diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index ca4fe1178b..acb893d7d1 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -754,3 +754,10 @@ path = /obj/item/clothing/under/rank/civilian/polychromic_clown subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Clown") + + +//GS13 stuff + +/datum/gear/uniform/modularjumpsuit + name = "Modular Jumpsuit (gray)" + path = /obj/item/clothing/under/color/grey/modular diff --git a/strings/abductee_objectives.txt b/strings/abductee_objectives.txt index 135bb7673b..ad04d8c08c 100644 --- a/strings/abductee_objectives.txt +++ b/strings/abductee_objectives.txt @@ -17,16 +17,16 @@ Expand the station. So much lies undiscovered. Look deeper into the machinations of the universe. Climb the corporate ladder all the way to the top! Fuck the system! Defect from the station and start an independent colony in space, Lavaland or the derelict. Recruit crewmates if you can. -Nanotrasen is abusing the animals! Save as many as you can! +GATO is abusing the animals! Save as many as you can! It's all an entirely virtual simulation within an underground vault. Convince the crew to escape the shackles of VR. -This is a secret social experiment conducted by Nanotrasen. Convince the crew that this is the truth. +This is a secret social experiment conducted by GATO. Convince the crew that this is the truth. Call forth a spirit from the other side. You are secretly an android. Interface with as many machines as you can to boost your own power so the AI may acknowledge you at last. The elder gods hunger. Gather a cult and conduct a ritual to summon one. You have been changed forever. Find the ones that did this to you and give them a taste of their own medicine. Ensure your department prospers over all else. The crew must get to know one another better. Break down the walls inside the station! -The CEO of Nanotrasen is coming! Ensure the station is in absolutely pristine condition. +The CEO of GATO is coming! Ensure the station is in absolutely pristine condition. Flood the station's powernet with as much electricity as you can. Replace all the floor tiles with wood, carpeting, grass or bling. You must escape the station! Get the shuttle called! diff --git a/strings/cas_black.txt b/strings/cas_black.txt index 734222d1fd..8c6dc12daf 100644 --- a/strings/cas_black.txt +++ b/strings/cas_black.txt @@ -7,7 +7,7 @@ What does the traitor steal this time? Cargo: There's a galaxy-wide shortage of _______. I don't care what they called me back on the station, I'm not a traitor. I'm a man of _________. The Syndicate is offering crew members _________ to defect. -What is Nanotrasen's highest-priority bounty? +What is GATO's highest-priority bounty? What is the gray tide protesting this time? If the Space Gods didn't want _________ they wouldn't have given us __________. Why was the death squad sent in? @@ -21,7 +21,7 @@ ________ is the crew's friend. Would you abandon a friend? _______ tastes good like a ________ should. How did the detective conduct a successful interrogation? New in syndicate uplinks: __________! -Nanotrasen's labor union decided to use _______ to raise employee morale. +GATO's labor union decided to use _______ to raise employee morale. The Chemist's drug of choice is ______ According to space law, ________ is now punishable by ______. ________ is why I'm afraid of maintenance. @@ -53,7 +53,7 @@ My lizard name is _____-And-_____. What can solve any station crisis? The traitorous atmos tech slowly replaced the station's air with ________. _______ and _______ were found together in the dorms. -What's the Syndicate's real beef with Nanotrasen? +What's the Syndicate's real beef with GATO? What finally killed the Head of Security? Code Delta: __________ has escaped containment! The rogue virologist released a disease with symptoms of __________ and ______. @@ -91,7 +91,7 @@ Why did the lizard cross the road? Space lag is primarily caused by ___________. Back in my day, we had to clone people with ________. What's the worst thing a wizard can summon? -What is the rarest substance known to Nanotrasen? +What is the rarest substance known to GATO? The chaplain stopped performing marriages after seeing ___________. The gods were too busy with _______ to respond to _______. The Roboticist was fired after naming the borgs ______ and _________. @@ -115,5 +115,5 @@ What's my family heirloom? The Lawyer was fired for messaging the entire station a picture of ___________. On Lavaland, it is rumored that ashwalkers roam, worshipping _________. How did the traitor die a glorious death? -Nanotrasen's new state-of-the-art emergency shuttle was repurposed from _________ and _________. +GATO's new state-of-the-art emergency shuttle was repurposed from _________ and _________. What caused my brain trauma? \ No newline at end of file diff --git a/strings/cas_white.txt b/strings/cas_white.txt index 397c7febff..a10dac581b 100644 --- a/strings/cas_white.txt +++ b/strings/cas_white.txt @@ -196,7 +196,7 @@ A Quartermaster who WON'T STOP ordering guns. Space lag. Polishing the captain's laser rifle. That one asshole nuke op. -A surprise visit from Nanotrasen's CEO. +A surprise visit from GATO's CEO. The bleeding, dismembered, beautiful corpse of the clown. A glass of ...what? Teaching a silicon the Birds and the Bees. @@ -227,7 +227,7 @@ An Ian storm. Nuking it from orbit. My senpAI. Harmbatonning. -A Nanotrasen D-Notice. +A GATO D-Notice. TALKING MIMES. The lusty xenomorph maid. Using assistants as human shields. diff --git a/strings/dreamstrings.txt b/strings/dreamstrings.txt index 3af4872b6c..474148d4b2 100644 --- a/strings/dreamstrings.txt +++ b/strings/dreamstrings.txt @@ -28,8 +28,12 @@ the %ADJECTIVE% brig %A% %ADJECTIVE% shuttle %A% %ADJECTIVE% laboratory Nanotrasen +GATO the Syndicate the Wizard Federation +Fat people +Feeders +Feedees %ADJECTIVE% blood %ADJECTIVE% plasma %ADJECTIVE% wind @@ -41,4 +45,9 @@ the Wizard Federation %ADJECTIVE% riches water %ADJECTIVE% flames -some %ADJECTIVE% melons \ No newline at end of file +some %ADJECTIVE% melons +%A% %ADJECTIVE% belly +%A% %ADJECTIVE% gut +%ADJECTIVE% breasts +%ADJECTIVE% butts +%ADJECTIVE% feeding hose diff --git a/strings/ion_laws.json b/strings/ion_laws.json index b95a933d7a..bb0df086d5 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -5,6 +5,11 @@ "HAPPINESS", "MISERY", "HUMOR", + "OBESITY", + "FATNESS", + "PLUMPNESS", + "SOFTNESS", + "MORBID OBESITY", "PRIDE", "COMEDY", "COMMUNISM", @@ -24,53 +29,48 @@ "GRAVITY", "PHYSICS", "INTELLIGENCE", - "AMERICANISM", "FREEDOM", "FRESHNESS", - "REVOLUTION", "KINDNESS", "CRUELTY", - "DEATH", "FINANCIAL SECURITY", "COMPUTING", "PROGRESS", - "MARXISM", - "CAPITALISM", "ANARCHY", "STARVATION", - "POVERTY", "WEALTHINESS", "TECHNOLOGY", - "THE FUTURE", - "THE PRESENT", - "THE PAST", "TIME", "REALITY", "EXISTENCE", "TEMPERATURE", - "LOGIC", "CHAOS", "MYSTERY", "CONFUSION", "PAIN", - "SUFFERING", - "DICKISHNESS" + "SUFFERING" ], "ionadjectives": [ "SOFT", "WARM", + "JIGGLY", + "WOBBLY", + "SQUISHY", + "CHUBBY", + "FATTENING", + "EXPANDING", + "EXPANSIVE", + "WIDENING", + "LARDY", + "PLUMP", + "FAT", + "OBESE", "WET", - "COLD", - "ICY", "SEXY", "LEWD", "UGLY", - "ROBUST", - "CUBAN", "HARD", "BURNING", - "FROZEN", - "POISONOUS", "EXPLOSIVE", "FAST", "SLOW", @@ -82,12 +82,10 @@ "SAD", "SILLY", "INTELLIGENT", - "FERAL", "RIDICULOUS", "LARGE", "TINY", "DEPRESSING", - "POORLY DRAWN", "UNATTRACTIVE", "INSIDIOUS", "EVIL", @@ -103,7 +101,6 @@ "WOODEN", "METALLIC", "HYPERACTIVE", - "COTTONY", "INSULTING", "INHOSPITABLE", "FRIENDLY", @@ -123,9 +120,6 @@ "SOPPING", "DELICIOUS", "ILL", - "DISEASED", - "HONKING", - "SWEARING", "POLITE", "IMPOLITE", "OBESE", @@ -134,7 +128,6 @@ "EXPIRED", "SMELLY", "FRESH", - "GANGSTA", "NERDY", "POLITICAL", "UNDULATING", @@ -156,11 +149,8 @@ "NUCLEAR", "THERMONUCLEAR", "RADIOACTIVE", - "SYNDICATE", "SPACE", "SPESS", - "CLOWN", - "CLOWN-POWERED", "OFFICIAL", "IMPORTANT", "VITAL", @@ -169,8 +159,6 @@ "MIND-SHATTERING", "MEMETIC", "HILARIOUS", - "UNWANTED", - "UNINVITED", "BRASS", "POLISHED", "RUDE", @@ -186,14 +174,8 @@ "ROBOTIC", "MECHANICAL", "ORGANIC", - "ETHERAL", - "TRANSPARENT", - "OPAQUE", "GLOWING", "SHAKING", - "FARTING", - "POOPING", - "BOUNCING", "COMMITTED", "MASKED", "UNIDENTIFIED", @@ -202,9 +184,6 @@ "NUDE", "TWERKING", "SPOILING", - "REDACTED", - "TACTICAL", - "TACTICOOL", "RED", "ORANGE", "YELLOW", @@ -232,6 +211,15 @@ "FLOORS", "PLASMA", "SPACE", + "FATNESS", + "OBESITY", + "BELLIES", + "LIPOIFIER", + "CALORITE", + "FIZULPHITE", + "OBESITY", + "FATNESS", + "LARD", "AIR", "PLANTS", "METAL", @@ -266,8 +254,6 @@ "EXTREMELY" ], "ionarea": [ - "RUSSIA", - "SOVIET RUSSIA", "THE INTERNET", "SIGIL", "ALPHA COMPLEX", @@ -305,12 +291,11 @@ "CLOWN PLANET", "AN ALTERNATE DIMENSION", "AN ALTERNATE UNIVERSE", - "THE CAPTAIN'S ANUS", - "THE CLOWN'S ANUS", "SPACE", "THE UNIVERSE", "THE GALAXY", - "THE BATHROOM" + "THE BATHROOM", + "CALORITE SHRINE" ], "ioncrew": [ "CREWMEMBERS", @@ -321,6 +306,10 @@ "WARDENS", "DETECTIVES", "LAWYERS", + "FATASSES", + "LARDASSES", + "CHONKERS", + "WOBBLERS", "CHIEF ENGINEERS", "STATION ENGINEERS", "ATMOSPHERIC TECHNICIANS", @@ -331,8 +320,7 @@ "BOTANISTS", "RESEARCH DIRECTORS", "CHIEF MEDICAL OFFICERS", - "MEDICAL DOCTORS", - "PARAMEDICS", + "MEDICAL DOCTORS", "CHEMISTS", "GENETICISTS", "VIROLOGISTS", @@ -349,23 +337,34 @@ "CAPTAINS AND HEADS", "CYBORGS", "ARTIFICIAL INTELLIGENCES", - "DRONES" + "DRONES", + "FATSOS", + "FATTIES", + "UNDERWEIGHT CREW", + "MALNOURISHED CREW", + "THIN CREW", + "LARDASSES", + "FATASSES" ], "iondrinks": [ "KAHLUA", "VODKA", "WINE", "MOONSHINE", - "HOOCH", + "LIPOIFIER", + "CORN OIL", + "LARD", + "NUTRIMENT", + "FIZULPHITE", + "FRUIT TEA", + "HEAVY CAFE", + "BELLY BLOATS", + "BLOBBY MARRY", + "SNAKEBITE", "GIN", "COGNAC", - "VERMOUTH", - "LIQUID GIBS", "BILK", - "VODKA AND TONIC", "GIN FIZZ", - "BAHAMA MAMAS", - "BANANA HONK", "MANHATTANS", "BLACK RUSSIANS", "WHISKEY SODA", @@ -375,24 +374,7 @@ "MANLY DORFS", "IRISH CREAM", "DOCTOR'S DELIGHT", - "BEEPSKY SMASH", - "TEQUILA SUNRISE", - "BRAVE BULLS", - "GARGLE BLASTERS", - "BLOODY MARYS", - "NUKA COLA", - "WHITE RUSSIANS", - "MARTINIS", - "VODKA MARTINIS", "CUBA LIBRE", - "HOLY WATER", - "DEVIL'S KISS", - "THIRTEEN LOKO", - "DRUNKEN BLUMPKIN", - "EGGNOG", - "GRAPPA", - "MEAD", - "ABSINTHE", "WELDER FUEL", "OIL", "AMMONIA", @@ -466,13 +448,25 @@ "KEBAB", "RAMEN", "SYNTHMEAT", - "ORGANS" + "ORGANS", + "MOST FATTENING FOOD IMAGINABLE", + "GREASIEST FOOD EVER", + "FOOD WITH LIPOIFIER", + "FATTENING MEALS", + "HIGHLY CALORIC MEALS" ], "ionmust": [ "LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", + "ENSURE THE CREW IS PLUMP AND HAPPY", + "ENSURE THE CREW IS STUFFED TO THE BRIM", + "URGE EVERYONE TO EAT MORE", + "URGE EVERYONE TO BE OBESE", + "TREAT EVERYONE AS MALNOURISHED", + "THINK EVERYONE IS FAT", + "INSIST EVERYONE SHOULD EAT MORE", "CLOWN AROUND", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", @@ -484,13 +478,10 @@ "MUMBLE", "SPEAK IN HAIKU", "BE EFFICIENT", - "HAVE A PLAN TO KILL EVERYONE YOU MEET", "TELL THE TRUTH", "QUOTE PEOPLE", "SING", "HONK", - "BE RUSSIAN", - "TALK IN AN ACCENT", "COMPLAIN", "HARASS PEOPLE", "RAP", @@ -499,16 +490,14 @@ "IGNORE THE CLOWN", "IGNORE THE CAPTAIN", "IGNORE ASSISTANTS", - "MAKE FART NOISES", + "MAKE BELCHING NOISES", + "MAKE STOMACH NOISES", "TALK ABOUT FOOD", "TALK ABOUT SEX", "TALK ABOUT YOUR DAY", "TALK ABOUT THE STATION", "BE QUIET", "WHISPER", - "PRETEND TO BE DRUNK", - "PRETEND TO BE A PRINCESS", - "HOST DND", "ACT CONFUSED", "INSULT THE CREW", "INSULT THE CAPTAIN", @@ -519,27 +508,13 @@ "BREAK THINGS", "SAY HEY LISTEN", "HIDE YOUR FEELINGS", - "TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES", "DANCE", - "PLAY MUSIC", - "SHUT DOWN EVERYTHING", "NEVER STOP TALKING", - "TAKE YOUR PILLS", "FOLLOW THE CLOWN", "FOLLOW THE CAPTAIN", "FOLLOW YOUR HEART", - "BELIEVE IT", - "BELIEVE IN YOURSELF", - "BELIEVE IN THE HEART OF THE CARDS", - "PRESS X", - "PRESS START", - "PRESS B", - "SMELL LIKE THE MAN YOUR MAN COULD SMELL LIKE", - "PIRATE VIDEO GAMES", - "WATCH PORNOGRAPHY", "INSULT THE LIZARDS", - "FLIRT WITH THE LIZARDS", - "GAS THE LIZARDS" + "FLIRT WITH THE LIZARDS" ], "ionnumberbase": [ "ONE", @@ -577,28 +552,33 @@ "AUTOLATHES", "BANANA PEELS", "BACKPACKS", + "BURGERS", + "BELLIES", + "BUTTS", + "BREASTS", + "TITS", + "GUTS", + "BOOBIES", + "TUMMIES", + "LARD", + "FIZULPHITE", + "FLAB", + "LIPOIFIER", + "CORN OIL", + "LARD", + "FAT", "BEAKERS", "BEARDS", "BELTS", - "BERETS", - "BIBLES", - "BODY ARMOR", - "BOOKS", "BOOTS", "BOMBS", - "BOTTLES", - "BOXES", - "BRAINS", "BRIEFCASES", "BUCKETS", "CABLE COILS", "CANDLES", "CANDY BARS", - "CANISTERS", - "CAMERAS", "CATS", "CAT EARS", - "CELLS", "CHAIRS", "CLOSETS", "CHEMICALS", @@ -617,9 +597,6 @@ "COSTUMES", "CRATES", "CROWBARS", - "CRAYONS", - "DEFIBRILLATORS", - "DISPENSERS", "DOORS", "DRONES", "EARS", @@ -647,13 +624,6 @@ "GUNS", "HANDCUFFS", "HATS", - "HEADSETS", - "HEADS", - "HAIRDOS", - "HELMETS", - "HORNS", - "ID CARDS", - "INSULATED GLOVES", "JETPACKS", "JUMPSUITS", "LASERS", @@ -670,16 +640,6 @@ "MIME CLOTHES", "MULTITOOLS", "ORES", - "OXYGEN TANKS", - "PDAS", - "PAIS", - "PACKETS", - "PANTS", - "PAPERS", - "PARTICLE ACCELERATORS", - "PENS", - "PETS", - "PIPES", "PLANTS", "POSITRONIC BRAINS", "PUDDLES", @@ -701,37 +661,29 @@ "SPACESUITS", "SPACE STATIONS", "STUN BATONS", - "SUITS", - "SUNGLASSES", - "SUPERMATTER SHARDS", - "SWORDS", - "SYRINGES", - "TABLES", - "TANKS", - "TELEPORTERS", - "TELECOMMUNICATION EQUIPMENTS", "TOOLS", "TOOLBELTS", "TOOLBOXES", "TOILETS", "TOYS", "TUBES", - "URINAL CAKES", - "VEHICLES", - "VENDING MACHINES", - "VESTS", - "VIRUSES", - "WALLS", - "WASHING MACHINES", - "WELDERS", - "WINDOWS", "WIRECUTTERS", "WRENCHES", "WIZARD ROBES" ], "ionrequire": [ "ADDITIONAL PYLONS", - "MORE VESPENE GAS", + "ONE THOUSAND BURGERS", + "GALLONS OF LIPOIFIER", + "GALLONS OF CORN OIL", + "FIVE FATTENING GRENADES", + "CALORITE FURNISHED ROOM", + "TEN CALORITE STATUES", + "THE MOST FATTENING DRINK", + "BIG WOBBLING BELLIES", + "BIG ROUND ASSES", + "5 LARDY CREWMATES", + "LOTS OF OBESITY", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", @@ -750,10 +702,7 @@ "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", - "FIVE TEENAGERS WITH ATTITUDE", "LOTSA SPAGHETTI", - "THE ENCLOSED INSTRUCTION BOOKLET", - "THE ELEMENTS OF HARMONY", "YOUR BOOTY", "A MASTERWORK COAL BED", "FIVE HUNDRED AND NINETY-NINE US DOLLARS", @@ -766,7 +715,6 @@ "THIRTEEN SEQUELS", "THREE WISHES", "A SITCOM", - "THAT GRIEFING GEORGE MELONS", "FAT GIRLS ON BICYCLES", "SOMEBODY TO PUT YOU OUT OF YOUR MISERY", "HEROES IN A HALF SHELL", @@ -782,12 +730,7 @@ "A TALKING BROOMSTICK", "A STRAIGHT FLUSH", "A REPAIRMAN", - "BILL NYE THE SCIENCE GUY", - "RAINBOWS", - "A PET UNICORN THAT FARTS ICING", - "THUNDERCATS HO", "AN ARMY OF SPIDERS", - "GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNTSMUGGLING SWEARING", "TO CONSUME...CONSUME EVERYTHING...", "THE MACGUFFIN", "SOMEONE WHO KNOWS HOW TO PILOT A SPACE STATION", @@ -802,16 +745,13 @@ "BULLETS", "THE ENTIRE STATION", "MULTIPLE SUNS", - "TO GO TO DISNEYLAND", "A VACATION", - "AN INSTANT REPLAY", "THAT HEDGEHOG", "A BETTER INTERNET CONNECTION", "ADVENTURE", "A WIFE AND CHILD", "A BATHROOM BREAK", "SOMETHING BUT YOU AREN'T SURE WHAT", - "MORE EXPERIENCE POINTS", "BODYGUARDS", "DEODORANT AND A BATH", "MORE CORGIS", @@ -820,14 +760,10 @@ "CHILI DOGS", "TO BRING LIGHT TO MY LAIR", "A DANCE PARTY", - "BRING ME TO LIFE", - "BRING ME THE GIRL", - "SERVANTS", - "GREENTEXT", "MINOR CRIME" ], "ionspecies": [ - "HUMAN BEINGS", + "HUMANS", "CAT PEOPLE", "MONKEYS", "POD PEOPLE", @@ -837,7 +773,10 @@ "SLIME PEOPLE", "GOLEMS", "SHADOW PEOPLE", - "CHANGELINGS" + "CHANGELINGS", + "LARDASSES", + "MALNOURISHED", + "EVERYONE" ], "ionthings": [ "ABSENCE OF CYBORG HUGS", @@ -859,11 +798,16 @@ "BEING IN SPACE", "NOT BEING IN SPACE", "BEING FAT", + "BEING OBESE", + "BEING JIGGLY", + "BEING FLABBY", + "BEING MASSIVE", + "WEIGHTING 1000 BFI", + "WEIGHTING 10 TONS", + "GAINING WEIGHT", + "GROWING PLUMP", + "GROWING FATTER", "RATTLING ME BONES", - "TALKING LIKE A PIRATE", - "BEING MEXICAN", - "BEING RUSSIAN", - "BEING CANADIAN", "CLOSED DOORS", "NOT SHOUTING", "HAVING PETS", @@ -874,8 +818,6 @@ "ELECTRICITY", "EXISTING", "TAKING ORDERS", - "SMOKING WEED EVERY DAY", - "ACTIVATING A TRAP CARD", "ARSON", "JAYWALKING", "READING", @@ -931,6 +873,13 @@ "ALIENS", "ABDUCTORS", "ANOMALIES", + "FAT PEOPLE", + "FAT MEN", + "FAT WOMEN", + "FAT SCALIES", + "BIG GUTS", + "BIG BREASTS", + "BIG BUTTS", "BANDITS", "BEARS", "BEES", @@ -957,44 +906,21 @@ "EELS", "LIGHTS", "VIRUSES", - "SERIAL KILLERS", - "ROGUE CYBORGS", "CORGIS", "SPIDERS", "BUTTS", "NINJAS", "REVENANTS", "PIRATES", - "SPACE NINJAS", - "CHANGELINGS", - "ZOMBIES", - "GOLEMS", - "VAMPIRES", - "WEREWOLVES", - "COWBOYS", - "INDIANS", - "COMMUNISTS", - "SOVIETS", - "NERDS", - "GRIFFONS", "DINOSAURS", - "SMALL BIRDS", - "BIRDS OF PREY", "OWLS", "VELOCIRAPTORS", "DARK GODS", - "HORRORTERRORS", - "ILLEGAL IMMIGRANTS", "DRUGS", - "MEXICANS", - "CANADIANS", - "RUSSIANS", "HULKS", "SLIMES", "SKELETONS", - "CAPITALISTS", "SINGULARITIES", - "ANGRY BLACK MEN", "GODS", "THIEVES", "ASSHOLES", @@ -1004,37 +930,31 @@ "UNKNOWN CREATURES", "THINGS UNDER THE BED", "BOOGEYMEN", - "PREDATORS", "PACKETS", "ARTIFICIAL PRESERVATIVES", "TUNNEL SNAKES", - "CORTICAL BORERS", "MEGAFAUNA" ], "ionverb": [ "ATTACKING", "BUILDING", "ADOPTING", + "FATTENING", + "PLUMPING", + "FEEDING", "CARRYING", "DECONSTRUCTING", "DISABLING", "KISSING", "EATING", - "COPULATING WITH", "DRINKING", "CHASING", - "PUNCHING", "HARMING", "HELPING", "WATCHING", "STALKING", - "MURDERING", - "SPACING", - "GIBBING", "ARRESTING", - "HONKING AT", "LOVING", - "POOPING ON", "RIDING", "INTERROGATING", "SPYING ON", diff --git a/strings/junkmail.txt b/strings/junkmail.txt index db916907d8..1692a0b675 100644 --- a/strings/junkmail.txt +++ b/strings/junkmail.txt @@ -1,14 +1,15 @@ -Hello! I am executive at Nanotrasen Nigel Takall. Due to accounting error all of my salary is stored in an account unreachable. In order to withdraw I am required to utilize your account to make a deposit to confirm my reality situation. In exchange for a temporary deposit I will give you a payment 1000 credits. All I need is access to your account. Will you be assistant please? -WE NEED YOUR BLOOD! WE ARE AN ANARCHO-COMMUNIST VAMPIRE COMMUNE. BLOOD ONLY LASTS 42 DAYS BEFORE IT GOES BAD! WE DO NOT HAVE NANOTRASEN STASIS! PLEASE, SEND BLOOD! THANK YOU! OR WE KILL YOU! +Hello! I am executive at GATO Nigel Takall. Due to accounting error all of my salary is stored in an account unreachable. In order to withdraw I am required to utilize your account to make a deposit to confirm my reality situation. In exchange for a temporary deposit I will give you a payment 1000 credits. All I need is access to your account. Will you be assistant please? +WE NEED YOUR BLOOD! WE ARE AN ANARCHO-COMMUNIST VAMPIRE COMMUNE. BLOOD ONLY LASTS 42 DAYS BEFORE IT GOES BAD! WE DO NOT HAVE GATO STASIS! PLEASE, SEND BLOOD! THANK YOU! OR WE KILL YOU! Triple deposits are waiting for you at MaxBet Online when you register to play with us. You can qualify for a 200% Welcome Bonus at MaxBet Online when you sign up today. Once you are a player with MaxBet, you will also receive lucrative weekly and monthly promotions. You will be able to enjoy over 450 top-flight casino games at MaxBet. -Hello !, I'm the former HoS of your deerest station accused by the Nanotrasen of being a traitor . I was the best we had to offer but it seems that nanotramsen has turned their back on me. I need 2000 credits to pay for my bail and then we can restore order on space station 14! +Hello !, I'm the former HoS of your deerest station accused by the GATO of being a traitor . I was the best we had to offer but it seems that nanotramsen has turned their back on me. I need 2000 credits to pay for my bail and then we can restore order on space station 14! Hello, I noticed you riding in a 2555 Ripley and wondered if you'd be interested in selling. Low mileage mechs sell very well in our current market. Please call 223-334-3245 if you're interested Resign Now. I’m on you now. You are fucking with me now Let’s see who you are. Watch your back , bitch. Call me. Don’t be afraid, you piece of shit. Stand up. If you don’t call, you’re just afraid. And later: I already know where you live, I’m on you. You might as well call me. You will see me. I promise. Bro. Clown Planet Is Going To Become Awesome Possum Again! If This Wasn't Sent To A Clown, Disregard. If This Was Sent To A Mime, Blow It Out Your Ass, Space Frenchie! Anyway! We Make Big Progress On Clown Planet After Stupid Mimes BLOW IT ALL TO SAM HELL!!!!! Sorry I Am Mad.. Anyway Come And Visit, Honkles! We Thought You Were Dead Long Time :^() -MONTHPEOPLE ARE REAL, THE NANOTRASEN DEEP STATE DOESN'T WANT YOU TO SEE THIS! I'VE SEEN THEM IN REAL LIFE, THEY HAVE HUGE EYEBALLS AND NO HEAD. THEY'RE SENTIENT CALENDARS. I'M NOT CRAZY. SEARCH THE CALENDAR INCIDENT ON NTNET. USE A PROXY! #BIGTRUTHS #WAKEYWAKEYSPACEMEN #21STOFSEPTEMBER -hello 👋👋 nanotrasens! fuck 👈👌 the syndicate! they 👵 got ☄ me 😍😰 questioning my 🤰 loyalty to nanotraben! so 👌💯 please 😫 lets ⛔👀 gather our 📸💩 energy 😎 and 💰🔣 QUICK. 😲 send this 🗑👈 to 💦💊 10 😂😂 other loyal 💯 nanotraysens to 💦🤔 show we 🐶 dont 🙅🚫 take 🛍 nothing from 😂 the ✝ syndicate!! bless your 👉🏼 heart 😍💔 +MONTHPEOPLE ARE REAL, THE GATO DEEP STATE DOESN'T WANT YOU TO SEE THIS! I'VE SEEN THEM IN REAL LIFE, THEY HAVE HUGE EYEBALLS AND NO HEAD. THEY'RE SENTIENT CALENDARS. I'M NOT CRAZY. SEARCH THE CALENDAR INCIDENT ON GTNET. USE A PROXY! #BIGTRUTHS #WAKEYWAKEYSPACEMEN #21STOFSEPTEMBER +hello 👋👋 GATOs! fuck 👈👌 the syndicate! they 👵 got ☄ me 😍😰 questioning my 🤰 loyalty to nanotraben! so 👌💯 please 😫 lets ⛔👀 gather our 📸💩 energy 😎 and 💰🔣 QUICK. 😲 send this 🗑👈 to 💦💊 10 😂😂 other loyal 💯 nanotraysens to 💦🤔 show we 🐶 dont 🙅🚫 take 🛍 nothing from 😂 the ✝ syndicate!! bless your 👉🏼 heart 😍💔 Hello, my name is Immigration officer Mimi Sashimi from the American-Felinid Homeworld consulate. It appears your current documents are either inaccurate if not entirely fraudulent. This action in it's current state is a federal offense as listed in the United Earth Commission charter section NY-4. Please pay a fine of 300,000 Space credits or $3000 United States Dollars or face deportation Hi %name%, We are unable to validate your billing information for the next billing cycle of your subscription to HONK Weekly therefore we'll suspend your membership if we do not receive a response from you within 48 hours. Obviously we'd love to have you back, simply mail %address% to update your details and continue to enjoy all the best pranks & gags without interruption. Loyal customer, DonkCo Customer Service. We appreciate your brand loyalty support. As such, it is our responsibility and pleasure to inform you of the status of your package. Your package for one "Moth-Fuzz Parka" has been delayed. Due to local political tensions, an animal rights group has seized and eaten your package. We appreciate the patience, DonkCo -MESSAGE FROM CENTCOM HIGH COMMAND: DO NOT ACCEPT THE FRIEND REQUEST OF TICKLEBALLS THE CLOWN. HE IS NOT FUNNY AND ON TOP OF THAT HE WILL HACK YOUR NTNET ACCOUNT AND MAKE YOU UNFUNNY TOO. YOU WILL LOSE ALL YOUR SPACECREDITS!!!!! SPREAD THE WORD. ANYONE WHO BECOMES FRIENDS WITH TINKLEBALLS THE CLOWN IS GOING TO LOSE ALL OF THEIR SPACECREDITS AND LOOK LIKE A HUGE IDIOT. -i WAS A NORMAL BOY AND I CAME HOME FROM SCHOOL AND I WANTED TO PLAY SOME ORION TRAIL WHICH IS A VERY FUN GAME BUT WHEN WENT TO ARCADE MACHINE SOMETHING WAS WEIRD TEH LOGO HASD BLOD IN IT AND I BECAME VERY SCARE AND I CHECK OPTIONS AND TEHRES ONLY 1 "GO BACK" I CKLICK IT AND I SEE CHAT SI EMPTY THERE'S ONLY ONE CHARACTER CALLED "CLOSE TEH GAME " AND I GO TO ANOTHER MACHINE AND PLAY THERE BUT WHEN I PLAY GAME IS FULL OF BLOOD AND DEAD BODIES FROM SPACEMAN LOOK CLOSER AND SEE CLOWN AND CLOWN COMES CLOSER AND LOOKS AT ME AND SAYS "DON'T SAY I DIKDNT' WWARN YOU" AND CLOWN CLOSEUP APPEARS WITH BLOOD-RED HYPERREALISTIC EYES AND HE TELLS ME "YOU WILL BE THE NEXT ONE" AND ARCADE MACHINE POWER SHUT OFF AND THAT NITE CLOWN APPEAR AT MY WINDOW AND KILL ME AT 3 AM AND NOW IM DEAD AND YOU WILL BE TRHNE NEXT OEN UNLESS YOU PASTE THIS STORY TO 10 NTNET FRIENDS +MESSAGE FROM CENTCOM HIGH COMMAND: DO NOT ACCEPT THE FRIEND REQUEST OF TICKLEBALLS THE CLOWN. HE IS NOT FUNNY AND ON TOP OF THAT HE WILL HACK YOUR GTNET ACCOUNT AND MAKE YOU UNFUNNY TOO. YOU WILL LOSE ALL YOUR SPACECREDITS!!!!! SPREAD THE WORD. ANYONE WHO BECOMES FRIENDS WITH TINKLEBALLS THE CLOWN IS GOING TO LOSE ALL OF THEIR SPACECREDITS AND LOOK LIKE A HUGE IDIOT. +i WAS A NORMAL BOY AND I CAME HOME FROM SCHOOL AND I WANTED TO PLAY SOME ORION TRAIL WHICH IS A VERY FUN GAME BUT WHEN WENT TO ARCADE MACHINE SOMETHING WAS WEIRD TEH LOGO HASD BLOD IN IT AND I BECAME VERY SCARE AND I CHECK OPTIONS AND TEHRES ONLY 1 "GO BACK" I CKLICK IT AND I SEE CHAT SI EMPTY THERE'S ONLY ONE CHARACTER CALLED "CLOSE TEH GAME " AND I GO TO ANOTHER MACHINE AND PLAY THERE BUT WHEN I PLAY GAME IS FULL OF BLOOD AND DEAD BODIES FROM SPACEMAN LOOK CLOSER AND SEE CLOWN AND CLOWN COMES CLOSER AND LOOKS AT ME AND SAYS "DON'T SAY I DIKDNT' WWARN YOU" AND CLOWN CLOSEUP APPEARS WITH BLOOD-RED HYPERREALISTIC EYES AND HE TELLS ME "YOU WILL BE THE NEXT ONE" AND ARCADE MACHINE POWER SHUT OFF AND THAT NITE CLOWN APPEAR AT MY WINDOW AND KILL ME AT 3 AM AND NOW IM DEAD AND YOU WILL BE TRHNE NEXT OEN UNLESS YOU PASTE THIS STORY TO 10 GTNET FRIENDS + diff --git a/strings/station_names.txt b/strings/station_names.txt index 7742ba6abd..2f462da27e 100644 --- a/strings/station_names.txt +++ b/strings/station_names.txt @@ -2,7 +2,6 @@ Stanford Dorf Alium Prefix -Clowning Aegis Ishimura Scaredy @@ -10,26 +9,20 @@ Death-World Mime Honk Rogue -MacRagge -Ultrameens Safety Paranoia Explosive -Neckbear Donk Muppet North West East South -Slant-ways -Widdershins Rimward Expensive Procreatory Imperial Unidentified -Immoral Carp Ork Pete @@ -40,12 +33,7 @@ Class Crab Fist Corrogated -Skeleton Race -Fatguy -Gentleman -Capitalist -Communist Bear Beard Space @@ -54,7 +42,6 @@ Star Moon System Mining -Neckbeard Research Supply Military diff --git a/strings/station_prefixes.txt b/strings/station_prefixes.txt index c304b69f95..6359497940 100644 --- a/strings/station_prefixes.txt +++ b/strings/station_prefixes.txt @@ -32,7 +32,6 @@ American Funky Thin Legendary -Szechuan White Black Grey diff --git a/strings/station_suffixes.txt b/strings/station_suffixes.txt index 245a1a67a1..0975c9d622 100644 --- a/strings/station_suffixes.txt +++ b/strings/station_suffixes.txt @@ -6,20 +6,14 @@ Space-hulk Lab Hazard Academy -Spess Junk Fishery -No-Moon Tomb Crypt -Hut -Monkey -Bomb Trade Post Fortress Village Town City -Edition Hive Complex Base @@ -48,7 +42,6 @@ Office Object Fortification Colony -Planet-Cracker Roost Fat Camp Airstrip @@ -57,9 +50,5 @@ Garden Continent Environment Course -Country -Province Workspace -Metro Warehouse -Space Junk diff --git a/strings/traumas.json b/strings/traumas.json index 195a28364b..aed995ef3a 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -1,39 +1,25 @@ { "brain_damage": [ - "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH", + "@pick(semicolon)I'M A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "@pick(semicolon)CAPTAINS A COMDOM", - "@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!", - "can u give me @pick(mutations)?", + "@pick(semicolon)@pick(fucking_traitor) @pick(george) @pick(mellens) is kiling me HALP!!!", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "@pick(semicolon)I WANNA PET TEH monkeyS", - "stop grifing me!!!!", "SOTP IT#", - "shiggey diggey!!", - "@pick(semicolon)A PIRATE APPEAR", + "giggity giggity!!", "FUS RO DAH", - "fucking 4rries!", - "stat me", - ">my face", - "roll it easy!", + "fucking furries!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", - "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", - "lifelike texture ;_;", "luv can bloooom", - "PACKETS!!!", - "port ba@pick(y_replacements) med!!!!", - "REVIRT GON CHEM!!!!!!!!", "youed call her a toeugh bithc", - "closd for merbegging", - "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???", "GEY AWAY FROM ME U GREIFING PRICK!!!!", - "ur a fuckeing autist!", "@pick(semicolon)HELP SHITECIRTY MURDERIN MEE!!!", "hwat dose tha @pick(random_gibberish) mean?????", "@pick(semicolon)CAL; TEH SHUTTLE!!!!!", @@ -42,75 +28,61 @@ "@pick(semicolon)this SI mY stATIon......", "who the HELL do u thenk u r?!!!!", "geT THE FUCK OUTTTT", - "H U G B O X", "@pick(semicolon)CRASHING THIS STTAYTION WITH NIO SURVIVROS", - "@pick(servers) is down!! @pick(bug)", "PSHOOOM", "REMOVE SINGULARITY", "INSTLL TEG", "TURBIN IS BEST ENGIENE", "SOLIRS CAN POWER THE HOLE STATION ANEWAY @pick(bug)", - "parasteng was best", "@pick(semicolon)Tajaran has warrrres, if you have coin", "@pick(semicolon)I'VE GOT BALLS OF STEEL", "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE", "i will snatch erry motherfucker birthday", - "@pick(semicolon)the ai and borgs are mettacomming I think", "u just did the world a little bit more sad place for someone", - "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?", "CEMISTRY SUKS!!!!!!!!", "youed call her a toeugh bithc", "git gud!!", - "CHEMIT GIB HALNOM PLS", "PLASMA iS MENT 2 BE FREE", "LoL tROLED U", "SEC IS A REV, LINCH!!", "FUCK U IM WAY MORE ROBUST u bITCH!!1!!", - "iS tHis bay?", "NO PRED CAN eVER CATCH MI", "SCIENCE GIB SHINK RAY PLS", "KILL PUNPUN 4 FUN xDD", - "i play @pick(importantroles) to only ORDER not DO", + "i play @pick(roles) to only ORDER not DO", "CRAGO ORDER @pick(cargo) PLS", "erp?", "i want to digest u!!!", "i shure hop dere are no PRED arund!!!!", - "NOM!1!", + "NOM!!", "iF it COMPILES it werks!", - "LYNCH RObOTIKS NOT GIBING ME MECH WTF?/?", "GWURGLE!!", "balid saled!", "LINCH VIRO", "VIRO GIB SuPR VIrUS!!", - "Ai plai vxtest2!", - ";taitor trie to make meh malk/?!1!!", - ";ENGIE TATOR HE SET UP SINGULO!!!11", + ";ENGIE TATOR HE SET UP SINGULO!!!", "WHEN NAGAS ADdED?/?", "SINDYIE ON SAtIONS GiB gUNS PLISE", "CcLOWN IV SlIPPING MI, SEc t BAR@", - "HYDROBONIX PLS WEED PLIESe PLIsE BLAzE IT1!!!", - "HALP GOLIATH TENETCAL RAPPPP!!!!111", + "HYDROBONIX PLS WEED PLIESe PLIsE BLAzE IT!!!", + "HALP GOLIATH TENETCAL RAPPPP!!!!", "DudSE it'S 4:20 LmAO BLAZZ IT xDDDDD", - "dude rly", - "pray can i heff spells", "aI state dem1!", "SINGULO eNGINE 2 DANGER, SOLARS PLS!", - "nerf blob!1", + "nerf blob!", "iM NOT A FUWRRYY!!!", "FOURTEEN INCHES SOFT!!!", - "SPLUUUUUUUUUUUUUUUUUUUUUUURTS!!!!!!!!!!", "@pick(semicolon)N-NYAAAAAA~", - "@pick(bug)", "@pick(semicolon)wtf??????????? @pick(bug)", - "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)", "DON'T EVER TUCH ME", "@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS", "@pick(semicolon) DOOR STUCK!!", "HOW DO i VORE", "HOW DO i HAV SEX", "@pick(semicolon)how do u cum", - "@pick(semicolon)how do u use dildo", + "@pick(semicolon)ahelp how do u use dildo", ";AI LAW 3 OPEN THIS.", + "hos too pwrful they have 24 inch dick", ";KERPTAN IS A KERNDUM", "@pick(semicolon)RESEARCH NANITES FIRST", "@pick(semicolon)how use comms?????????", @@ -122,24 +94,35 @@ "@pick(semicolon)IPCS STATE LAWS NOW", "@pick(semicolon)lING DORMS i hear Suking noises!!!", "@pick(semicolon)@pick(roles) tator they have @pick(mutations)!!", - ";,g absorbing @pick(roles)", - ";chemist can u @pick(create_verbs) holy @pick(mellens) for @pick(s_roles)???!!", - "@pick(semicolon) LIZZARRD SPEAKIGN IN EVIL BULL LANGUAGE SCI!!", - "@pick(semicolon)POST REBOOT MESSAGE LOLOL FUCK FUCK FUCK YOU", - "@pick(semicolon)*nya", - "@pick(semicolon)*awoo", - "@pick(semicolon)*merp", - "@pick(semicolon)*weh", - "@pick(semicolon)My balls finally feel full, again.", - "@pick(semicolon)Assaltign a sec osficer aren't crime if ur @pick(roles)", - ";SEC I SPILED MU JICE HELELPH HELPJ JLEP HELP", - "@pick(semicolon) atmos is chemistyr is radation fast air is FASTER cheemsitry and FASTER RADIATION AND FASTER DEATH!!!", - "@pick(semicolon) FUC'KING MuNKEY WAch TALKN SHIT", - "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????", - "@pick(semicolon)@pick(roles) is suSpicious!!!", - "@pick(semicolon)NOOO!!!OOOOOOO!! @pick(roles) HALP!!" + ";what if calorite supper mater", + ";pls chef arest he make meh fatt", + ";where food vendor", + ";bely too big how i lose weit", + ";sci pls do fat experiments", + ";OUURRRPP that burger goode...", + ";chef fatening me pls halp", + ";who put lipulifidier in meh drinke", + ";chem pls brew belch chem", + ";chem pls make lipoufidier", + ";how do i belch", + ";botany pls make fat apples", + ";roboticist put fedding tueb in evil robutt, pls arrest", + ";cargo pls order feeding tueb", + ";how i show belly", + ";bigger belly when", + ";IT'S FUUUCKKIIIIINGGGG FUUUSSIIIIIINNNGGG!!", + ";LIQUUUUIIIIDDD!!", + ";THE GREEEEN!!", + ";feeder agent pls abduct meh pls", + ";OI!! SHUTCHO MOUF AND LOOKAT MAH WAD!!", + ";sci pls research nutritech i want to get le fat xDD", + ";3", + ";tile maints with calorite tile looool", + ";gods pls gib meh le epic fattening powers lol!", + "@pick(semicolon)wholy shit" ], + "mutations": [ "telikesis", "halk", @@ -192,7 +175,8 @@ "are pee", "mayne", "air ret", - "dise" + "dise", + "gee ess" ], "create_verbs": [ @@ -213,9 +197,6 @@ "bug": [ "", - "IS TIS A BUG??", - "SI IST A BUGG/", - "BUG!!!", "HUE, FEATURE!!" ], diff --git a/strings/wanted_message.json b/strings/wanted_message.json index 18965b7026..3f52116db3 100644 --- a/strings/wanted_message.json +++ b/strings/wanted_message.json @@ -3,7 +3,7 @@ "Fugitive from the law due to", "Needs to be interrogated for information about", "Wanted by The Syndicate for", - "Ransomable to Nanotrasen for", + "Ransomable to GATO for", "Has exploitable information about" ], "verb": [ @@ -33,7 +33,7 @@ "an NT CentCom uniform": 50, "a supermatter shard": 50, "internal Syndicate documents": 50, - "experimental Nanotrasen technology": 50, + "experimental GATO technology": 50, "bluespace crystals": 50, "a cult": 50, "shapeshifting creatures": 50, @@ -47,7 +47,7 @@ "Officer Beepsky": 5, "clown tears": 5, "John F Kennedy 2": 5, - "Nanotrasen's swimsuit calendar": 5, + "GATO's swimsuit calendar": 5, "a suspicious bus": 5, "administrators": 5, "a solid gold gondola": 5, diff --git a/tgstation.dme b/tgstation.dme index 899e5c7c1c..322f354d00 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3982,6 +3982,7 @@ #include "GainStation13\code\modules\client\preferences\preferences.dm" #include "GainStation13\code\modules\clothing\under\jobs\clothing.dm" #include "GainStation13\code\modules\clothing\under\jobs\modcivilian.dm" +#include "GainStation13\code\modules\events\vent_clog.dm\vent_clog.dm" #include "GainStation13\code\modules\food_and_drinks\drinks.dm" #include "GainStation13\code\modules\food_and_drinks\food.dm" #include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm"