mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
Removes the Nazi sprites in the code. Again. For like the umpteenth time. (#10407)
This commit is contained in:
Cameron Lennox
GitHub
104
1Item_list.dmm
104
1Item_list.dmm
@@ -9795,12 +9795,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"cSJ" = (
|
||||
/obj/item/clothing/suit/storage/labcoat/fluff/zeke_vincir_3/axis,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"cSK" = (
|
||||
/obj/item/reagent_containers/food/snacks/donut/homer/jelly,
|
||||
/turf/simulated/fitness{
|
||||
@@ -11741,12 +11735,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"dwO" = (
|
||||
/obj/item/clothing/head/axiscap/officer,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"dwV" = (
|
||||
/obj/item/clothing/head/soft/med,
|
||||
/turf/simulated/fitness{
|
||||
@@ -15069,12 +15057,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"evu" = (
|
||||
/obj/item/clothing/under/axis,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"evA" = (
|
||||
/obj/machinery/power/rtg/abductor/built,
|
||||
/turf/simulated/fitness{
|
||||
@@ -15499,12 +15481,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"eBC" = (
|
||||
/obj/item/clothing/suit/space/void/merc/axis/axisrig,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"eBE" = (
|
||||
/obj/machinery/magnetic_module,
|
||||
/turf/simulated/fitness{
|
||||
@@ -28802,12 +28778,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"ivh" = (
|
||||
/obj/item/clothing/suit/space/void/merc/axis/sovrig,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"ivm" = (
|
||||
/obj/machinery/door/airlock/angled_bay/standard/color/security,
|
||||
/turf/simulated/fitness{
|
||||
@@ -35862,12 +35832,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"kyF" = (
|
||||
/obj/item/clothing/suit/storage/labcoat/fluff/zeke_vincir_3/axis/officer,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"kyR" = (
|
||||
/obj/vehicle/train/rover/engine/dunebuggy,
|
||||
/turf/simulated/fitness{
|
||||
@@ -38038,12 +38002,6 @@
|
||||
/mob/living/simple_mob/horror/Master,
|
||||
/turf/simulated/floor/atoll,
|
||||
/area/survivalpod)
|
||||
"ldJ" = (
|
||||
/obj/item/clothing/head/axiscap,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"ldO" = (
|
||||
/obj/item/clothing/accessory/solgov/department/exploration/jumper,
|
||||
/turf/simulated/fitness{
|
||||
@@ -39270,12 +39228,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"lxZ" = (
|
||||
/obj/item/clothing/head/helmet/space/void/axis/merc/sovrigh,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"lya" = (
|
||||
/obj/item/clothing/under/color/fjumpsuit/bluef,
|
||||
/turf/simulated/fitness{
|
||||
@@ -42901,12 +42853,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"mBv" = (
|
||||
/obj/item/clothing/head/helmet/space/void/merc/axis/axisrigh,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"mBw" = (
|
||||
/obj/item/storage/belt/explorer/pathfinder,
|
||||
/turf/simulated/fitness{
|
||||
@@ -46296,12 +46242,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"nyQ" = (
|
||||
/obj/item/clothing/head/helmet/axis,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"nyR" = (
|
||||
/obj/machinery/transhuman/synthprinter,
|
||||
/turf/simulated/fitness{
|
||||
@@ -47445,12 +47385,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"nON" = (
|
||||
/obj/item/clothing/under/axis/officer,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"nOP" = (
|
||||
/obj/machinery/power/port_gen/pacman/super/potato,
|
||||
/turf/simulated/fitness{
|
||||
@@ -57871,12 +57805,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"qXp" = (
|
||||
/obj/item/clothing/suit/space/void/merc/axis,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"qXq" = (
|
||||
/obj/item/storage/box/botanydisk,
|
||||
/turf/simulated/fitness{
|
||||
@@ -71971,12 +71899,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"vhb" = (
|
||||
/obj/item/clothing/head/helmet/space/void/merc/axis,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"vhc" = (
|
||||
/obj/item/storage/box/casino/costume_sexyclown,
|
||||
/turf/simulated/fitness{
|
||||
@@ -100099,7 +100021,7 @@ ecy
|
||||
apG
|
||||
viO
|
||||
bSW
|
||||
ldJ
|
||||
bSW
|
||||
chs
|
||||
iPo
|
||||
vGa
|
||||
@@ -100301,7 +100223,7 @@ mnD
|
||||
gYy
|
||||
bSW
|
||||
bSW
|
||||
dwO
|
||||
bSW
|
||||
bsR
|
||||
pbv
|
||||
kez
|
||||
@@ -102480,7 +102402,7 @@ jKg
|
||||
rDt
|
||||
fyU
|
||||
ubC
|
||||
nyQ
|
||||
bSW
|
||||
fxM
|
||||
lvD
|
||||
wth
|
||||
@@ -102700,7 +102622,7 @@ rmi
|
||||
whe
|
||||
wov
|
||||
wKe
|
||||
vhb
|
||||
bSW
|
||||
hxh
|
||||
dNn
|
||||
tey
|
||||
@@ -102902,7 +102824,7 @@ aQE
|
||||
eAQ
|
||||
jGW
|
||||
nCH
|
||||
mBv
|
||||
bSW
|
||||
dXS
|
||||
mnh
|
||||
tzO
|
||||
@@ -102946,7 +102868,7 @@ tlR
|
||||
bRZ
|
||||
gXF
|
||||
pHC
|
||||
qXp
|
||||
bSW
|
||||
mEF
|
||||
trR
|
||||
gCt
|
||||
@@ -103098,7 +103020,7 @@ dEJ
|
||||
cNT
|
||||
qay
|
||||
owM
|
||||
lxZ
|
||||
bSW
|
||||
azT
|
||||
lsS
|
||||
oUq
|
||||
@@ -103148,8 +103070,8 @@ rcG
|
||||
edf
|
||||
jck
|
||||
fch
|
||||
eBC
|
||||
ivh
|
||||
bSW
|
||||
bSW
|
||||
tId
|
||||
qMt
|
||||
gRN
|
||||
@@ -106197,7 +106119,7 @@ jPD
|
||||
hcY
|
||||
iMx
|
||||
fdu
|
||||
evu
|
||||
bSW
|
||||
aYV
|
||||
eka
|
||||
iKh
|
||||
@@ -106399,7 +106321,7 @@ qxc
|
||||
mmT
|
||||
jlN
|
||||
qwZ
|
||||
nON
|
||||
bSW
|
||||
jpb
|
||||
vqW
|
||||
kif
|
||||
@@ -107472,7 +107394,7 @@ eeF
|
||||
nAp
|
||||
mFl
|
||||
uXh
|
||||
cSJ
|
||||
bSW
|
||||
gqy
|
||||
jQc
|
||||
gKe
|
||||
@@ -107674,7 +107596,7 @@ vwy
|
||||
gEF
|
||||
vAD
|
||||
lpT
|
||||
kyF
|
||||
bSW
|
||||
saf
|
||||
nVY
|
||||
vbW
|
||||
|
||||
@@ -1,110 +0,0 @@
|
||||
//head
|
||||
|
||||
/obj/item/clothing/head/axiscap
|
||||
name = "Feldmütze"
|
||||
desc = "Despite being designed for use in an armoured vehicle, this cap sports a remarkable lack of armor of any sort. Mind your Kopf."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "panzercap"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "panzercap_mob"
|
||||
|
||||
/obj/item/clothing/head/axiscap/officer
|
||||
name = "Einheitsfeldmütze"
|
||||
desc = "A great leader has many things. Honor, conviction, determination, a nerve of steel. And above all, a hat of the utmost quality."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "officercap"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "officercap_mob"
|
||||
|
||||
/obj/item/clothing/head/helmet/axis
|
||||
name = "Stalhelm"
|
||||
desc = "The archetypical symbol for miltary tyranny; this humble-looking steel pot protects against everything from bullets and shrapnel to the occasional loosed Bierglas. Unterseiten oben!"
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "stalhelm"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "stalhelm_mob"
|
||||
armor = list(melee = 10, bullet = 50, laser = 0, energy = 0, bomb = 20, bio = 0, rad = 10)
|
||||
|
||||
//under
|
||||
|
||||
/obj/item/clothing/under/axis
|
||||
name = "Feldanzug"
|
||||
desc = "When participating in die Blitzkrieg it is important for your uniform to be professional and functional, as well as devilishly dapper."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "soldieruniform"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "soldieruniform_mob"
|
||||
|
||||
/obj/item/clothing/under/axis/officer
|
||||
name = "Officer's Feldanzug"
|
||||
desc = "When participating in die Blitzkrieg it is important for your uniform to be professional and functional, as well as devilishly dapper."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "officeruniform"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "officeruniform_mob"
|
||||
|
||||
//suits
|
||||
|
||||
/obj/item/clothing/suit/storage/labcoat/fluff/zeke_vincir_3/axis
|
||||
name = "Waffenrock"
|
||||
desc = "This coat might not stop the bite of Soviet bullets, nor the sting of Siberian winds, but God be damned, if it isn't stylish!"
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "soldiersuit"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "soldiersuit_mob"
|
||||
blood_overlay_type = "coat"
|
||||
allowed = list(/obj/item/gun/energy,
|
||||
/obj/item/reagent_containers/spray/pepper,
|
||||
/obj/item/gun/projectile,
|
||||
/obj/item/ammo_magazine,
|
||||
/obj/item/ammo_casing,
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/handcuffs)
|
||||
|
||||
/obj/item/clothing/suit/storage/labcoat/fluff/zeke_vincir_3/axis/officer
|
||||
name = "Officer's Waffenrock"
|
||||
desc = "This coat might not stop the bite of Soviet bullets, nor the sting of Siberian winds, but God be damned, if it isn't stylish!"
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "officersuit"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "officersuit_mob"
|
||||
|
||||
|
||||
//place holders (WIP)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/merc/axis
|
||||
|
||||
/obj/item/clothing/suit/space/void/merc/axis
|
||||
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/merc/axis/axisrigh
|
||||
name = "Weltraumsoldat helm"
|
||||
desc = "A obscure helmet that only seems to fit a human and comes with the markings 'Weltraumsoldaten' on it."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "rig0-axish"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "rig0-axis_mob"
|
||||
|
||||
/obj/item/clothing/suit/space/void/merc/axis/axisrig
|
||||
name = "Weltraumsoldat hardsuit"
|
||||
desc = "A obscure hardsuit that only seems to fit a human and comes with the markings 'Weltraumsoldaten' on it."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "rig-axisr"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "rig-axis_mob"
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/axis/merc/sovrigh
|
||||
name = "Soviet helm"
|
||||
desc = "A obscure helmet that only seems to fit a human and comes with the markings 'CMC-300 Powered Combat Suit' on it."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "rig0-sovieth"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "rig0-soviet_mob"
|
||||
|
||||
/obj/item/clothing/suit/space/void/merc/axis/sovrig
|
||||
name = "Soviet hardsuit"
|
||||
desc = "A obscure hardsuit that only seems to fit a human and comes with the markings 'CMC-300 Powered Combat Suit' on it."
|
||||
icon = 'icons/vore/axisrus_yw.dmi'
|
||||
icon_state = "rig-sovietr"
|
||||
icon_override = 'icons/vore/axisrus_yw.dmi'
|
||||
item_state = "rig-soviet_mob"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB |
@@ -378,8 +378,6 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/clothing/suit/space/void/merc/axis/sovrig,
|
||||
/obj/item/clothing/head/helmet/space/void/axis/merc/sovrigh,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/awaymission/carpfarm/base)
|
||||
"bu" = (
|
||||
|
||||
@@ -4620,7 +4620,6 @@
|
||||
#include "code\modules\vore\eating\vorehooks_vr.dm"
|
||||
#include "code\modules\vore\eating\vorepanel_ch.dm"
|
||||
#include "code\modules\vore\eating\vorepanel_vr.dm"
|
||||
#include "code\modules\vore\fluffstuff\axisrus_yw.dm"
|
||||
#include "code\modules\vore\fluffstuff\custom_boxes_ch.dm"
|
||||
#include "code\modules\vore\fluffstuff\custom_boxes_vr.dm"
|
||||
#include "code\modules\vore\fluffstuff\custom_boxes_yw.dm"
|
||||
|
||||
Reference in New Issue
Block a user