From 83cbca5f075dc2e11a8c159c0f597918ef136f3a Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Thu, 15 Apr 2021 12:25:18 +0100 Subject: [PATCH] But if you close your eyes --- .../RandomRuins/SpaceRuins/gasthelizards.dmm | 678 ------------------ code/datums/ruins/space.dm | 6 - code/modules/clothing/head/vg_hats.dm | 26 - code/modules/clothing/spacesuits/vg_spess.dm | 20 - .../mob/living/carbon/human/species.dm | 2 +- config/spaceRuinBlacklist.txt | 1 - html/archivedchangelog.html | 2 +- .../code/game/machinery/vending.dm | 30 - strings/insult.json | 3 +- strings/phobia.json | 1 - 10 files changed, 3 insertions(+), 766 deletions(-) delete mode 100644 _maps/RandomRuins/SpaceRuins/gasthelizards.dmm diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm deleted file mode 100644 index e21c3a92..00000000 --- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +++ /dev/null @@ -1,678 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) -"c" = ( -/turf/closed/wall, -/area/ruin/space/has_grav/gasthelizard) -"d" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/bed, -/obj/effect/decal/remains/human, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"e" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"f" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/bed, -/obj/effect/decal/remains/human, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"g" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/bed, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"h" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"i" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"j" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"k" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"l" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel/airless/dark, -/area/ruin/space/has_grav/gasthelizard) -"m" = ( -/obj/structure/closet/crate/freezer, -/obj/item/stack/sheet/animalhide/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/turf/open/floor/plasteel/freezer, -/area/ruin/space/has_grav/gasthelizard) -"n" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/turf/open/floor/plasteel/freezer, -/area/ruin/space/has_grav/gasthelizard) -"o" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/clothing/under/rank/prisoner, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/turf/open/floor/plasteel/freezer, -/area/ruin/space/has_grav/gasthelizard) -"p" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"q" = ( -/obj/machinery/door/window/brigdoor/northleft, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"r" = ( -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"s" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"t" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "Worn-out APC"; - pixel_x = 1; - pixel_y = 26 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"u" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"v" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"w" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"x" = ( -/obj/structure/kitchenspike, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"y" = ( -/obj/structure/table/reinforced, -/obj/item/kitchen/knife/butcher, -/obj/item/restraints/handcuffs, -/obj/item/reagent_containers/spray/pepper, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"z" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"A" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"B" = ( -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"C" = ( -/obj/machinery/gibber, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"D" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/straight_jacket, -/obj/item/reagent_containers/syringe/lethal, -/obj/item/reagent_containers/syringe/lethal/choral, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"E" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"F" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"G" = ( -/obj/structure/chair/office/dark, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"H" = ( -/obj/machinery/door/airlock/security, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"I" = ( -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/reagent_containers/glass/bottle/chloralhydrate{ - name = "chloral hydrate bottle" - }, -/obj/item/reagent_containers/glass/bottle/toxin{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/reagent_containers/glass/bottle/facid{ - name = "fluorosulfuric acid bottle"; - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"J" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/drone, -/obj/item/melee/baton/cattleprod, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"K" = ( -/obj/structure/table, -/obj/item/pen/red, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"L" = ( -/obj/structure/table, -/obj/item/paper_bin, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"M" = ( -/obj/structure/table, -/obj/item/storage/box/prisoner, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"N" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light, -/obj/structure/table, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"O" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"P" = ( -/obj/structure/table/reinforced, -/obj/item/surgicaldrill, -/obj/item/hemostat, -/obj/item/scalpel, -/obj/item/surgical_drapes, -/obj/item/retractor, -/obj/item/cautery, -/obj/item/circular_saw, -/obj/machinery/light, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"Q" = ( -/obj/structure/table/optable, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"R" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/glass/bottle/mutagen, -/obj/item/reagent_containers/glass/bottle/mutagen, -/obj/item/razor, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/gasthelizard) -"S" = ( -/obj/machinery/suit_storage_unit/security, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"T" = ( -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"U" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/gasthelizard) -"V" = ( -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/ruin/space/has_grav/gasthelizard) -"W" = ( -/turf/open/floor/plating, -/area/ruin/space/has_grav/gasthelizard) -"Z" = ( -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/gasthelizard) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -b -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -b -b -b -b -a -b -b -b -a -a -a -"} -(3,1,1) = {" -a -a -a -b -b -c -c -c -c -c -c -c -b -a -"} -(4,1,1) = {" -a -b -b -b -b -c -s -z -E -J -S -c -b -b -"} -(5,1,1) = {" -b -a -c -c -c -c -t -A -F -B -T -c -c -c -"} -(6,1,1) = {" -a -b -c -d -i -p -u -B -B -B -B -V -W -Z -"} -(7,1,1) = {" -b -b -c -e -j -q -v -B -B -B -U -c -c -c -"} -(8,1,1) = {" -a -b -c -f -k -p -u -B -B -K -c -c -b -b -"} -(9,1,1) = {" -b -b -c -e -j -q -v -B -G -L -c -b -b -a -"} -(10,1,1) = {" -a -a -c -g -k -p -u -B -B -M -c -b -a -a -"} -(11,1,1) = {" -b -b -c -e -j -q -v -B -B -N -c -b -a -a -"} -(12,1,1) = {" -b -a -c -f -k -p -u -B -B -O -c -b -a -a -"} -(13,1,1) = {" -a -b -c -h -l -q -w -B -B -O -c -b -a -a -"} -(14,1,1) = {" -a -b -c -c -c -c -c -c -H -c -c -b -a -a -"} -(15,1,1) = {" -a -b -b -c -m -r -x -C -r -P -c -a -a -a -"} -(16,1,1) = {" -a -b -b -c -n -r -r -r -r -Q -c -a -a -a -"} -(17,1,1) = {" -a -a -b -c -o -r -y -D -I -R -c -b -b -a -"} -(18,1,1) = {" -a -a -b -c -c -c -c -c -c -c -c -b -a -a -"} -(19,1,1) = {" -a -a -a -a -b -b -a -a -b -b -b -a -a -a -"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 0dba9e20..995bae81 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -105,12 +105,6 @@ name = "Empty Shell" description = "Cosy, rural property availible for young professional couple. Only twelve parsecs from the nearest hyperspace lane!" -/datum/map_template/ruin/space/gas_the_lizards - id = "gas-the-lizards" - suffix = "gasthelizards.dmm" - name = "Disposal Facility 17" - description = "Gas efficiency at 95.6%, fluid elimination at 96.2%. Will require renewed supplies of 'carpet' before the end of the quarter." - /datum/map_template/ruin/space/intact_empty_ship id = "intact-empty-ship" suffix = "intactemptyship.dmm" diff --git a/code/modules/clothing/head/vg_hats.dm b/code/modules/clothing/head/vg_hats.dm index efeb5291..81e28259 100644 --- a/code/modules/clothing/head/vg_hats.dm +++ b/code/modules/clothing/head/vg_hats.dm @@ -94,32 +94,6 @@ icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' - -/obj/item/clothing/head/stalhelm - name = "Stalhelm" - desc = "Ein Helm, um die Nazi-Interesse an fremden Raumstationen zu sichern." - icon_state = "stalhelm" - item_state = "stalhelm" - icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' - -/obj/item/clothing/head/panzer - name = "Panzer Cap" - desc = "Command any mech in style." - icon_state = "panzercap" - item_state = "panzercap" - icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' - -/obj/item/clothing/head/naziofficer - name = "Officer Cap" - desc = "Style is all that matters." - icon_state = "officercap" - item_state = "officercap" - icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' - - /obj/item/clothing/head/russobluecamohat name = "russian blue camo beret" desc = "A symbol of discipline, honor, and lots and lots of removal of some type of skewered food." diff --git a/code/modules/clothing/spacesuits/vg_spess.dm b/code/modules/clothing/spacesuits/vg_spess.dm index e6b1c7a1..92b86adc 100644 --- a/code/modules/clothing/spacesuits/vg_spess.dm +++ b/code/modules/clothing/spacesuits/vg_spess.dm @@ -1,25 +1,5 @@ //VG Ports -/obj/item/clothing/head/helmet/space/hardsuit/nazi - name = "nazi hardhelmet" - desc = "This is the face of das vaterland's top elite. Gas or energy are your only escapes." - item_state = "hardsuit0-nazi" - icon_state = "hardsuit0-nazi" - armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) - item_color = "nazi" - icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - -/obj/item/clothing/suit/space/hardsuit/nazi - name = "nazi hardsuit" - desc = "The attire of a true krieger. All shall fall, and only das vaterland will remain." - item_state = "hardsuit-nazi" - icon_state = "hardsuit-nazi" - slowdown = 1 - armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) - allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/) - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/nazi - icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - /obj/item/clothing/head/helmet/space/hardsuit/soviet name = "soviet hardhelmet" desc = "Crafted with the pride of the proletariat. The vengeful gaze of the visor roots out all fascists and capitalists." diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 9b457213..e822b381 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/fixed_mut_color2 = "" var/fixed_mut_color3 = "" var/whitelisted = 0 //Is this species restricted to certain players? - var/whitelist = list() //List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both. + var/whitelist = list() //List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666") Spaces & capitalization can be included or ignored entirely for each key as it checks for both. var/icon_limbs //Overrides the icon used for the limbs of this species. Mainly for downstream, and also because hardcoded icons disgust me. Implemented and maintained as a favor in return for a downstream's implementation of synths. diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt index edf16cc1..6243a44d 100644 --- a/config/spaceRuinBlacklist.txt +++ b/config/spaceRuinBlacklist.txt @@ -25,7 +25,6 @@ #_maps/RandomRuins/SpaceRuins/derelict6.dmm #_maps/RandomRuins/SpaceRuins/djstation.dmm #_maps/RandomRuins/SpaceRuins/emptyshell.dmm -#_maps/RandomRuins/SpaceRuins/gasthelizards.dmm #_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm #_maps/RandomRuins/SpaceRuins/intactemptyship.dmm #_maps/RandomRuins/SpaceRuins/listeningstation.dmm diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 6c139e77..f470bbf1 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -4993,7 +4993,7 @@ Standard issue Engineering cyborgs now come equipped with replacement floor tile

How they get on-board: The quartermaster can now set the receiver frequency of his supplycomp circuit board. A bit simplistic as of now, will work on it later. Building a supplycomp with a properly set up circuitboard will give access to the Contraband crate.

How they're used: Unfold the rolled poster on any wall or r_wall to create the poster. There are currently 17 designs, with the possibility of me adding more.

How to get rid of them: You can rip them using your hand... To cleanly extract them and not ruin them for future use, however, you can use a pair of wirecutters. -

How they're classified: They're contraband, so it's perfectly okay for security officers to confiscate them. Punishment for contraband-providers (or end-users, if you want to go full nazi) is up to the situational commanding officers. +

How they're classified: They're contraband, so it's perfectly okay for security officers to confiscate them. Punishment for contraband-providers is up to the situational commanding officers.

Nodrak updated:

diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 9777d33c..b65088a8 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -87,32 +87,6 @@ refill_canister = /obj/item/vending_refill/kink baseprice = 2 -/* -/obj/machinery/vending/nazivend - name = "Nazivend" - desc = "A vending machine containing Nazi German supplies. A label reads: \"Remember the gorrilions lost.\"" - icon = 'icons/obj/citvending.dmi' - icon_state = "nazi" - vend_reply = "SIEG HEIL!" - product_slogans = "Das Vierte Reich wird zuruckkehren!;ENTFERNEN JUDEN!;Billiger als die Juden jemals geben!;Rader auf dem adminbus geht rund und rund.;Warten Sie, warum wir wieder hassen Juden?- *BZZT*" - products = list( - /obj/item/clothing/head/stalhelm = 20, - /obj/item/clothing/head/panzer = 20, - /obj/item/clothing/suit/soldiercoat = 20, - // /obj/item/clothing/under/soldieruniform = 20, - /obj/item/clothing/shoes/jackboots = 20 - ) - contraband = list( - /obj/item/clothing/head/naziofficer = 10, - // /obj/item/clothing/suit/officercoat = 10, - // /obj/item/clothing/under/officeruniform = 10, - /obj/item/clothing/suit/space/hardsuit/nazi = 3, - /obj/item/gun/energy/plasma/MP40k = 4 - ) - premium = list() - - refill_canister = /obj/item/vending_refill/nazi -*/ /obj/machinery/vending/sovietvend name = "KomradeVendtink" desc = "Rodina-mat' zovyot!" @@ -152,10 +126,6 @@ icon = 'modular_citadel/icons/vending_restock.dmi' icon_state = "refill_kink" -/obj/item/vending_refill/nazi - machine_name = "nazivend" - icon_state = "refill_nazi" - /obj/item/vending_refill/soviet machine_name = "sovietvend" icon_state = "refill_soviet" diff --git a/strings/insult.json b/strings/insult.json index 7c884525..a2f2e12f 100644 --- a/strings/insult.json +++ b/strings/insult.json @@ -171,7 +171,6 @@ "wank", "jerk", "bitch", - "cuck", - "ligger" + "cuck" ] } diff --git a/strings/phobia.json b/strings/phobia.json index 67eedf4c..5db372b4 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -108,7 +108,6 @@ "lizards": [ "lizard", - "ligger", "hiss", "hissed", "hissing",