From 005c87bdf6771a28ad1571e8572cc41024d7d1cc Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 30 Oct 2019 01:31:29 +0100 Subject: [PATCH] I'm making a joke title, don't ban me github. --- code/modules/clothing/head/vg_hats.dm | 14 --------- code/modules/clothing/spacesuits/vg_spess.dm | 19 ------------ icons/obj/citvending.dmi | Bin 6338 -> 4504 bytes .../code/game/machinery/vending.dm | 29 ------------------ 4 files changed, 62 deletions(-) diff --git a/code/modules/clothing/head/vg_hats.dm b/code/modules/clothing/head/vg_hats.dm index dc245cd39a..87f64baf13 100644 --- a/code/modules/clothing/head/vg_hats.dm +++ b/code/modules/clothing/head/vg_hats.dm @@ -82,13 +82,6 @@ item_state = "nr_helmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.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' - /obj/item/clothing/head/panzer name = "Panzer Cap" desc = "Command any mech in style." @@ -96,13 +89,6 @@ item_state = "panzercap" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.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' - /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 e6b1c7a1ee..517539f3af 100644 --- a/code/modules/clothing/spacesuits/vg_spess.dm +++ b/code/modules/clothing/spacesuits/vg_spess.dm @@ -1,24 +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" diff --git a/icons/obj/citvending.dmi b/icons/obj/citvending.dmi index 37c2c8fcf1d13871417597ec0331aee40fde9c41..8f836b7eb5116b0def626f06c1194214e9ea2a8f 100644 GIT binary patch literal 4504 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 literal 6338 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 diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 6a91810173..a71175c345 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -72,32 +72,7 @@ /obj/item/reagent_containers/glass/bottle/hexacrocin = 10 ) refill_canister = /obj/item/vending_refill/kink -/* -/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!" @@ -137,10 +112,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"