From f7c1c8b0e92c58dd1d813848cf43393141f14d9f Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 31 Jan 2015 23:36:56 -0500 Subject: [PATCH] Spacesuit Buff --- code/game/gamemodes/cult/cult_items.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 4 +- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/spacesuits/ert.dm | 2 +- .../clothing/spacesuits/miscellaneous.dm | 20 ++-- code/modules/clothing/spacesuits/syndi.dm | 2 +- icons/obj/aicards.dmi | Bin 2956 -> 1787 bytes maps/cyberiad.dmm | 99 ++++++++++-------- 8 files changed, 69 insertions(+), 62 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 25835e6ae92..81c3b5f19d7 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -100,7 +100,7 @@ item_state = "cult_armour" desc = "A bulky suit of armour, bristling with spikes. It looks space proof." w_class = 3 - allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit) slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 1724b921850..9e0ffec3dd8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -232,6 +232,6 @@ New() ..() sleep(2) - new /obj/item/clothing/suit/space/paramedic(src) - new /obj/item/clothing/head/helmet/space/paramedic(src) + new /obj/item/clothing/suit/space/eva/paramedic(src) + new /obj/item/clothing/head/helmet/space/eva/paramedic(src) return \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index fb8977de393..9f3e9474fab 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -304,7 +304,7 @@ BLIND // can't see anything permeability_coefficient = 0.02 flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit) slowdown = 2 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT||HIDETAIL diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 601de3b0dd4..1dd56938504 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -28,7 +28,7 @@ icon_state = "ert_commander" item_state = "suit-command" w_class = 3 - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank) slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \ diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 012497c8e08..b47cca56802 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -14,7 +14,7 @@ icon_state = "caparmor" item_state = "capspacesuit" w_class = 4 - allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) + allowed = list(/obj/item/weapon/tank, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) slowdown = 1 armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) siemens_coefficient = 0.7 @@ -35,7 +35,7 @@ desc = "A heavily armored, advanced space suit that protects against most forms of damage." icon_state = "deathsquad" item_state = "swat_suit" - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank) armor = list(melee = 80, bullet = 80, laser = 50,energy = 50, bomb = 100, bio = 100, rad = 100) slowdown = 1 max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT @@ -92,26 +92,24 @@ icon_state = "pirate" item_state = "pirate" w_class = 3 - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank) slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0.9 //Paramedic EVA suit -/obj/item/clothing/head/helmet/space/paramedic +/obj/item/clothing/head/helmet/space/eva/paramedic name = "Paramedic EVA helmet" - desc = "A paramedic space helmet. Used in the recovery of bodies from space." + desc = "A paramedic EVA helmet. Used in the recovery of bodies from space." icon_state = "paramedic-eva-helmet" item_state = "paramedic-eva-helmet" -/obj/item/clothing/suit/space/paramedic +/obj/item/clothing/suit/space/eva/paramedic name = "Paramedic EVA suit" icon_state = "paramedic-eva" item_state = "paramedic-eva" - desc = "A paramedic space suit. Used in the recovery of bodies from space." - slowdown = 1 - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL + desc = "A paramedic EVA suit. Used in the recovery of bodies from space." /obj/item/clothing/suit/space/eva name = "EVA suit" @@ -128,7 +126,7 @@ desc = "A lightweight space helmet with the basic ability to protect the wearer from the vacuum of space during emergencies." flags_inv = HIDEMASK|HIDEEARS|HIDEEYES armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) - + //Mime's Hardsuit /obj/item/clothing/head/helmet/space/eva/mime name = "mime eva helmet" @@ -143,7 +141,6 @@ desc = "An EVA suit specifically designed for the mime." icon_state = "spacemime_suit" item_state = "spacemime_items" - allowed = list(/obj/item/weapon/tank) /obj/item/clothing/head/helmet/space/eva/clown name = "clown eva helmet" @@ -158,4 +155,3 @@ desc = "An EVA suit specifically designed for the clown. SPESSHONK!" icon_state = "spaceclown_suit" item_state = "spaceclown_items" - allowed = list(/obj/item/weapon/tank) diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index fb2976ac9cb..a7797fcdc48 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -14,7 +14,7 @@ item_state = "space_suit_syndicate" desc = "Has a tag on it: Totally not property of of a hostile corporation, honest!" w_class = 3 - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank) slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0.8 diff --git a/icons/obj/aicards.dmi b/icons/obj/aicards.dmi index a28931ed90cccab21d732d7f26bc527e21bec871..c1068e6fb2a922e44fe38383ffd89b61ee13b13a 100644 GIT binary patch literal 1787 zcmZ9Lc~p}J62QMNltWOEAY@mOB&@B7Ts4-PBnk=v+xcV8_hx=?=FN9r9?l2U532(J zaDd?AbP)hRg$qopDJk?g*CkA061?1r=lFcSnyM-Sfv~^*Qa7Rqf&jgsOaQ`Qu~=T4 z5zvG2_V&hLFtlEI`XofUOgV8iJ2WDSNDlG5L~_0-r1!}IKpyy9?%5(SWmE$gNY^)M zaZ@Un%d@7Sl+Kkeqwl!7x@Kl(l2QXpOG_2wt`pB9mKqTg4FE~S`99AzZ(8hkXsY+$%E=OL&AklIQ50~MG69jJg5jcUENo5RL$1Z$?5mhWh z3XJ@oZYZBO{O5x%1Fi6rH^yvlztJ&pt?e;sQqg@8@B}_#{ll*DwFUc$V_%CONt7CY zHNFKconDVIYU60;9-kpUf*T6bvr^Enix#IvYuWIn)_amZ`kG0Rg*mD-;K6m)L2SuO zc!JePplx{cHPZloqND!J6H)w{SHFkLKk!#+)?Z6mCX0)SsoZ%DrnfA~`_tPL08ln3 zIGrIT6|aFBR1W7g7-Xk%*k$d7U!dSX$VY znhB%olB01#TDp75D`s9+b5mG z`xahYxitej5hQIj;IMYO!ZoZsJw4B3`g<$osfLy?wt6$^3u2k+L=-Q^x3(vKCXY24 z{hG~EHHO{3er7fg$V$@#m-h1AtE+#m^9{1P7Kl90&-Bpo0>|=LVli%^yOt*eA^CX= zBN)Bd)P1S&f)ZMLdf>tr!?;(HNpYWj>G!uh*K!24y+$R8k^jOM8No(HviFU5Dp>{kUZf4bhx!d4 zpyMEY)Pr0j2kV%gWAZVPz1P|l+<{hZke3goe!p?E~@zN9u zW}qTAn0jh{PQ6vqSJU#-ixjdx88y2Ru=7AU0WST)NBy zjYHNzNM9_iWUF6Q1le`_%xnfSaVr}HD79fvmXsXFU_u*&l6D?2gt*_1X@rGSvP1{s zO3h*@4t>3AX^~egSe^|H;wr}qP<*Cn3HDS(bYFM=y7gUQ& z(5tlU1YS#Iv#$dN-#Q|?oG=KD6+TUw*jBCYWprxelQYtwy~Em}@p*PI_O`OULl={| zY*4CKvu7Hmg{-DDWU<$)@jJT5?lMfIQt*nVV4Qb{i(Kc4KEq=rqgVRfL_!%&zL&A} z0oBi}cr`1OfIDRF?ppL3&#HBDru(>bDr2h~g4%HF#UZmHOuip>TPh~dTKs;|zF(!b zesn4%xLwOt87fVM zZFuQEio(7!=^TSrop@}vroi}ruqGM9Y;b0C`3A#mZyRj1J+i3RgMzt05T`L^YcIWg z_MOYKP)+TECp71j6!%Y}-8V~7oka_nDSr%8Ltl)`+$nS literal 2956 zcmaJ@X*ksF8vl=>8Edve8Dr_C;?0~GW?)>(nRAGUtzU?;#!M>lHOUxNIhjGEU(})D%Ay< zlcWn3kO_Y*d?PtjPX{Rq*KECgrfVA8vH#ioqhOQbdxsXnToLSL zh)LXxLTQeZeq!(63hzJ2oy>i>aWQrL@a#%Pa%tnTU1!Vr6h4&DegLRN)odh{so?;)Icz64f%RuU_MJTVdq}`22j}4*k<*DDeJTd~$ zVPpg`J|a(%W16y2TteOE`lDAHdpy(9RLcWZCHSY1iUXXINNzDruTJ2RJ&GRf z=I$mPw0i-+SKgxl>qm(=f#sK?AI>#K8A%?=@tIf z5O3)>7t%mSSa~C>zRcW&#**SjZHrB-(CnExeVPX|4gO>hh}FJ}4D|{K5DI}Y59j)1abgp*U{e%9n}M-(VP4CMLdMI48DY< zGD@1C7f9*x1!73dj``IzCd#WMAHw2hzxRW3vk)3visR6aC$yaYZim@;oRH!Swxp>< z`II;h+@NOmZ;^2Za6p3Ql&y|?a_V()BO8V!@k`N3$t%k}-y4z}QLN#mNcdSAc8+SZ zzgpC_rWpECMT68Hg|?_g|AU_Tp$CHBVuVNNbT zl_k<}iRuVWFQt{K9cE%H-TxO6l+XOG5NlQ`qkkFt)o2g(aw_cl_5$TA zP*7#(bhRPj8nxI_i4oYQ#+DnOeNZ=Ra}+PrpB#?fGFfK!d8@xYzarD6T(AlLh9%S) z4r77c!St*4HtYWiQQ3gA_~wmz5>HLPEo&NJNE0eN->Ty(WZCp~lC|RW+vKnKQw;AM z*jsJPpf#tUzrEDrr2$$#;c414EAsk%)N)uLBuVaVazrD;f(rWDKX+poOX!Us@4DGc zJ6zLMI9&D@R@;>ZCL?Y-|L#f}2MF$JYE~OVMj$1nzANhfr71cBlJ1KD9c4CcMYs5+ zSpDxRU1P|fP?z)*-Apu;uxHv;cH3Iej?L%J+$Fd* zj53pP-CuXsWnBdjgY*`kqRbct1*ez!Yh2GZO5}cS0h&QJpVIqy&etDJ7oqb(fem3Y z1;ifBBYD{YXpsU#`Tip`%rSm(Bw-Tq@Hp9b!IT|{i;F`bk#E0(URPK9_oDEEmgzFh zBO{{99wR_>+nbE!#KcuSc#BxxLy*Saj7?gT=nfSZiZzjpM>r7j^75cS$m*n+usVs0 zJC69u&tP(bza6(V6{({RXksv6F)406w~5`qfw8eM10#Ujdd0b`f>~O* z$QD4dzV5p*$@1WlBrj!TXDh3L6!c815qHKW5lBWx#;ajm6bAdeyXcLoS~EDf!3n=U+p~}#^WkZ(4r`zyO2}lmj*iaD_aqYR-Me>3_TH$G z10-q@;N|75PDvfEwggxTspzDm;$` z2~N4X57>?aC(Ug30+`4JVaz!(No5dlC6ukfo?jfgs2u{8U|ww`J-^*Ha@Yzlql>sH52A)j2j} zcF89Q6%|h4+Mk-%HF1T7ZtM|S0VI4uVPQMjrjbjPhtm}!K#&GfV?N54+AY%OJJJ~p z2ne`wBif|m7e+z8Jg4Rb`CxL6IN3XI1~d;9^@Y*yvR;bsr8cSS0C51;^!ZbsskIqh zdXX8d{nwe_43|1brjc5(d1cQTd>kMQg4!3*4^C=8yaw}EK|DF0yX7BXF_ocaNyjB+ z=vxdOc-+lClrekeHU~^4Sv$nhmK3BB!$;O_tE9Rwb4um>{I`H~CDqD|37Cg@|swspT zALp~fWg5#$`=wJsgC`Iw>m{dTfZW7Bm*g&jej>q1SNwL%r=2