From 373a8bd126824f2c091f4086d820adefc90eed93 Mon Sep 17 00:00:00 2001 From: Duck- Date: Tue, 19 Aug 2014 20:30:23 -0400 Subject: [PATCH 1/3] but wait what if i wasn't dumb Bugfix patch. Forgot to commit clothes. Forgot to commit self respect. --- code/modules/client/preferences_gear.dm | 116 ++++++++++--------- code/modules/clothing/suits/miscellaneous.dm | 6 + code/modules/research/designs.dm | 2 +- data/investigate/gravity.html | 4 +- icons/obj/clothing/suits.dmi | Bin 86109 -> 86111 bytes 5 files changed, 70 insertions(+), 58 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index a598c02c..cbea8c1f 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -60,79 +60,79 @@ proc/populate_gear_list() display_name = "hair flower pin" path = /obj/item/clothing/head/hairflower cost = 2 - slot = slot_head +// slot = slot_head /datum/gear/bandana display_name = "pirate bandana" path = /obj/item/clothing/head/bandana cost = 3 - slot = slot_head +// slot = slot_head /datum/gear/overalls display_name = "overalls" path = /obj/item/clothing/suit/apron/overalls cost = 2 - slot = slot_wear_suit +// slot = slot_wear_suit /datum/gear/wcoat display_name = "waistcoat" path = /obj/item/clothing/suit/wcoat cost = 2 - slot = slot_wear_suit +// slot = slot_wear_suit /datum/gear/prescription display_name = "prescription sunglasses" path = /obj/item/clothing/glasses/sunglasses/prescription cost = 3 - slot = slot_glasses +// slot = slot_glasses /datum/gear/eyepatch display_name = "eyepatch" path = /obj/item/clothing/glasses/eyepatch cost = 3 - slot = slot_glasses +// slot = slot_glasses /datum/gear/flatcap display_name = "flat cap" path = /obj/item/clothing/head/flatcap cost = 2 - slot = slot_head +// slot = slot_head /datum/gear/redsoftcap display_name = "red softcap" path = /obj/item/clothing/head/soft/red cost = 2 - slot = slot_head +// slot = slot_head /datum/gear/bluesoftcap display_name = "blue softcap" path = /obj/item/clothing/head/soft/blue cost = 2 - slot = slot_head +// slot = slot_head /datum/gear/greensoftcap display_name = "green softcap" path = /obj/item/clothing/head/soft/green cost = 2 - slot = slot_head +// slot = slot_head /datum/gear/greysoftcap display_name = "grey softcap" path = /obj/item/clothing/head/soft/grey cost = 2 - slot = slot_head +// slot = slot_head /datum/gear/purplesoftcap display_name = "purple softcap" path = /obj/item/clothing/head/soft/purple cost = 2 - slot = slot_head +// slot = slot_head /datum/gear/labcoat display_name = "labcoat" path = /obj/item/clothing/suit/storage/labcoat cost = 3 - slot = slot_wear_suit +// slot = slot_wear_suit /datum/gear/bluescrubs display_name = "blue scrubs" @@ -149,11 +149,17 @@ proc/populate_gear_list() path = /obj/item/clothing/under/rank/medical/green cost = 1 +/datum/gear/surgeryapron + display_name = "surgical apron" + path = /obj/item/clothing/suit/apron/surgery + cost = 1 + + /datum/gear/sandal display_name = "sandals" path = /obj/item/clothing/shoes/sandal cost = 1 - slot = slot_shoes +// slot = slot_shoes /datum/gear/work_boots display_name = "work boots" @@ -164,121 +170,121 @@ proc/populate_gear_list() display_name = "leather shoes" path = /obj/item/clothing/shoes/leather cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/dress_shoes display_name = "dress shoes" path = /obj/item/clothing/shoes/centcom cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/black_gloves display_name = "black gloves" path = /obj/item/clothing/gloves/black cost = 1 - slot = slot_gloves +// slot = slot_gloves /datum/gear/red_gloves display_name = "red gloves" path = /obj/item/clothing/gloves/red cost = 1 - slot = slot_gloves +// slot = slot_gloves /datum/gear/blue_gloves display_name = "blue gloves" path = /obj/item/clothing/gloves/blue cost = 1 - slot = slot_gloves +// slot = slot_gloves /datum/gear/orange_gloves display_name = "orange gloves" path = /obj/item/clothing/gloves/orange cost = 1 - slot = slot_gloves +// slot = slot_gloves /datum/gear/purple_gloves display_name = "purple gloves" path = /obj/item/clothing/gloves/purple cost = 1 - slot = slot_gloves +// slot = slot_gloves /datum/gear/brown_gloves display_name = "brown gloves" path = /obj/item/clothing/gloves/brown cost = 1 - slot = slot_gloves +// slot = slot_gloves /datum/gear/green_gloves display_name = "green gloves" path = /obj/item/clothing/gloves/green cost = 2 - slot = slot_gloves +// slot = slot_gloves /datum/gear/white_gloves display_name = "white gloves" path = /obj/item/clothing/gloves/white cost = 2 - slot = slot_gloves +// slot = slot_gloves /datum/gear/black_shoes display_name = "black shoes" path = /obj/item/clothing/shoes/black cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/blue_shoes display_name = "blue shoes" path = /obj/item/clothing/shoes/blue cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/brown_shoes display_name = "brown shoes" path = /obj/item/clothing/shoes/brown cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/green_shoes display_name = "green shoes" path = /obj/item/clothing/shoes/green cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/orange_shoes display_name = "orange shoes" path = /obj/item/clothing/shoes/orange cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/purple_shoes display_name = "purple shoes" path = /obj/item/clothing/shoes/purple cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/red_shoes display_name = "red shoes" path = /obj/item/clothing/shoes/red cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/white_shoes display_name = "white shoes" path = /obj/item/clothing/shoes/white cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/yellow_shoes display_name = "yellow shoes" path = /obj/item/clothing/shoes/yellow cost = 2 - slot = slot_shoes +// slot = slot_shoes /datum/gear/jackboots display_name = "jackboots" path = /obj/item/clothing/shoes/jackboots cost = 3 - slot = slot_shoes +// slot = slot_shoes /datum/gear/webbing display_name = "webbing" @@ -323,76 +329,76 @@ proc/populate_gear_list() /datum/gear/skirt_blue display_name = "blue plaid skirt" path = /obj/item/clothing/under/dress/plaid_blue - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/skirt_red display_name = "red plaid skirt" path = /obj/item/clothing/under/dress/plaid_red - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/skirt_purple display_name = "purple plaid skirt" path = /obj/item/clothing/under/dress/plaid_purple - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/skirt_green display_name = "green plaid skirt" path = /obj/item/clothing/under/dress/plaid_green - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/skirt_black display_name = "black skirt" path = /obj/item/clothing/under/blackskirt - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/sundress display_name = "sundress" path = /obj/item/clothing/under/sundress - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/uniform_captain display_name = "captain's dress uniform" path = /obj/item/clothing/under/dress/dress_cap - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 allowed_roles = list("Captain") /datum/gear/uniform_hop display_name = "HoP dress uniform" path = /obj/item/clothing/under/dress/dress_hop - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 allowed_roles = list("Head of Personnel") /datum/gear/uniform_hr display_name = "HR director uniform" path = /obj/item/clothing/under/dress/dress_hr - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 allowed_roles = list("Head of Personnel") /datum/gear/kilt display_name = "kilt" path = /obj/item/clothing/under/kilt - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/exec_suit display_name = "executive suit" path = /obj/item/clothing/under/suit_jacket/really_black - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/exec_suit display_name = "executive suit" path = /obj/item/clothing/under/suit_jacket/really_black - slot = slot_w_uniform +// slot = slot_w_uniform cost = 3 /datum/gear/oldmansuit @@ -406,7 +412,7 @@ proc/populate_gear_list() display_name = "Security HUD" path = /obj/item/clothing/glasses/hud/security cost = 3 - slot = slot_glasses +// slot = slot_glasses allowed_roles = list("Security Officer","Head of Security","Warden") /datum/gear/black_vest @@ -417,7 +423,7 @@ proc/populate_gear_list() /datum/gear/armpit display_name = "shoulder holster" - path = /obj/item/clothing/tie/holster/armpit +// path = /obj/item/clothing/tie/holster/armpit cost = 3 allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Head of Security") @@ -425,7 +431,7 @@ proc/populate_gear_list() display_name = "security beret" path = /obj/item/clothing/head/beret/sec cost = 1 - slot = slot_head +// slot = slot_head allowed_roles = list("Security Officer","Head of Security","Warden") //Engineering @@ -433,7 +439,7 @@ proc/populate_gear_list() display_name = "engineering beret" path = /obj/item/clothing/head/beret/eng cost = 1 - slot = slot_head +// slot = slot_head allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer") /datum/gear/brown_vest @@ -446,7 +452,7 @@ proc/populate_gear_list() display_name = "engineering bandana" path = /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 cost = 2 - slot = slot_head +// slot = slot_head allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer") //Science @@ -464,14 +470,14 @@ proc/populate_gear_list() display_name = "Zhan-Khazan furs" path = /obj/item/clothing/suit/tajaran/furs cost = 3 - slot = slot_wear_suit +// slot = slot_wear_suit whitelisted = "Tajaran" /datum/gear/zhan_scarf display_name = "Zhan-Khazan headscarf" path = /obj/item/clothing/head/tajaran/scarf cost = 2 - slot = slot_head +// slot = slot_head whitelisted = "Tajaran" */ @@ -479,12 +485,12 @@ proc/populate_gear_list() display_name = "roughspun robe" path = /obj/item/clothing/suit/unathi/robe cost = 3 - slot = slot_wear_suit +// slot = slot_wear_suit whitelisted = "Unathi" /datum/gear/unathi_mantle display_name = "hide mantle" path = /obj/item/clothing/suit/unathi/mantle cost = 2 - slot = slot_wear_suit +// slot = slot_wear_suit whitelisted = "Unathi" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index d9c6707a..74b3610e 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -110,6 +110,12 @@ item_state = "overalls" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS +/obj/item/clothing/suit/apron/surgery + name = "surgical apron" + desc = "To keep their blood off while you knife them." + icon_state = "surgeon" + item_state = "surgeon" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS /obj/item/clothing/suit/syndicatefake name = "red space suit replica" diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 20b5e6d5..206d0f85 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1595,7 +1595,7 @@ datum/design/smg datum/design/rapidlaser name = "Rapid-fire Laser" desc = "A fast-firing laser that shoots bursts of weaker beams." - id = "smg" + id = "rapidlaser" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE materials = list("$metal" = 5000, "$uranium" = 1000) diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html index f90f8a6c..8ab1a86a 100644 --- a/data/investigate/gravity.html +++ b/data/investigate/gravity.html @@ -1,2 +1,2 @@ -19:49 [0x200775f] (92,152,1) || the gravitational generator has regained power.
-19:49 [0x200775f] (92,152,1) || the gravitational generator is now charging.
+16:13 [0x2007747] (92,152,1) || the gravitational generator has regained power.
+16:13 [0x2007747] (92,152,1) || the gravitational generator is now charging.
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 677da897b700ea6e09fb707046923f693391c75b..ee83355308bf4b4130b71bc77f33579b4a03351b 100644 GIT binary patch delta 804 zcmV+<1Ka%FpatKc1&|~Gzp*8!0e=`MDz~~^*mc=NCZ&Jqj+WZ8^!4S26g^rZNgiia z4>Utb3!AhwCe6S*YEsv7G-C6^dw$dfD37-++yuL%n83tjvv{BbU%{~~%pE+%^;AT$SOjNyWvQYH`8(8ZDM7vqsk$*EZ>&+U) z)6-%CPczW4k~AOr339=;SWPD`Ks7D3^?T!+R9>1beYN5L9s2XnIv!yI=MB_-|D+DB zQ~|O!QD_C3#u9~Apql5%{G=B8rI&J<#el0rY+R|Y(AXmw=TH`MJYs>w8(@<#VD}r7 zFqEh4`?IJ?7|!yHX=L}$w}1ZBdSas(`>EkttRq=cAU|Fbj$;3u&OA+$`>$%&GR4N= z4Pe&dGo7Aryix{X-S5S*ZSdwQvBjgS2=3LH%yZu0)GDyWr&R)Xi7cs&#`_3Nh$dl3 z?8Q;Pzg;+MKV(h9Ks5p6-mW)GtpBmq(P>JQJ@>PLt&W9VGpYS6DSulX(NkcnBj+HQ z0WVC#P&CZI+-wqtmZ{D%xS6Tn-xB2-`6|;_uM^A)p;!JF5*%S@0TsW*2CyW%42y9o z4cJeg^fEXyf(GiPJW=Yu2eL#_3RPT4 zax)O?lnLz0Y)#U^364SxX$&sN8x(F-`aWTy~! zoma8h$@jSpg`}LRV(auR8%uv~*eK!8ZFEr!kjln>yhh9x7V~3iwnT>YzsE5X>-S68 z#Csewv96&|3-4%f=@}dT1aDzX{a%dW{Qwe&lPG?Dm_)||WkJ61Orm4p%m!RFCh1p! iNpw7kY1Du@>XXC-9tdvYM|)ZlLlJ}O1h?u00dq^`^p6Pu delta 804 zcmV+<1Ka%HpatEa1&|~Gy|E>y0e{3%AG{Uj!mi6EGAaF2ceK=&rLQkHr0UTUN%A8lO@Z_%HB*769OIB%ft`zLj1 zr3#R>i9##LIF=~10@XZ6<|nn#FTIq@EC$>iV&h7Eg~lGiIES*3;}Hua-T<3~0lVOs zgrPiT-ycRz!f=*nOe4F0zJK+{))O1W*iQ}DVjann0{QWha1{IJbmnQ2+<#TGmMJy{ zuK=?apXv03wYheZG$&gi7g&oMR2dqWS;W|r&fV2KCKeCOJqrHG~P#GLNp0O zVh>H87tY!bS(7kOO#r#K>(vtLe{6Mhni6Ht{cK>XV`0}!YX45kR)0tI6xiy>IY?%} z3zIMu4Kpw|n}nfds^@^fHvn6oDPlNiS={cgZza#>tr6 z48(dl8pk-6CUpcC$$xJo@TOhqfH!yEilgcDDlxYNEG*s#tdEUvLO*rUz_~_t3Vhr! zQLu#|3x>5fp{Y6pP2s?~aE2abug1BEE7&UF6-UNxr&OV@GdFOURWY?#sK1by;@8V( zzhb>zS#040=S}=cY@0tbr%eJ?FA$F{P)x#*BqL+7Nf>TJ0Dr=>)v;*w0!}X3Da2jp zRcvW}0TVXy z9>+|qYbeyhI~rVi#)dz^TNqQn7h`xofW+Y>ieDcl(eXf8kWW05=omP&A*+7rSAj`% iJc()4fH~?Crjy7790<20N7Cz?zZZk-1h?!20dq@`xr4d@ From dcacd65b3f39fde9fe855e227f1237a8059d6100 Mon Sep 17 00:00:00 2001 From: Duck- Date: Tue, 19 Aug 2014 20:39:06 -0400 Subject: [PATCH 2/3] Bugfix part two because I'm dumb? Fixes crossbows. Woops. Turns out I rebroke their sprites and then fixed it and then I undid the fix because. --- code/modules/projectiles/guns/projectile/bow.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm index 5081bc55..903c265f 100644 --- a/code/modules/projectiles/guns/projectile/bow.dm +++ b/code/modules/projectiles/guns/projectile/bow.dm @@ -210,7 +210,7 @@ /obj/item/weapon/crossbowframe name = "crossbow frame" desc = "A half-finished crossbow." - icon_state = "crossbowframe0" + icon_state = "crossbow" item_state = "crossbow-solid" var/buildstate = 0 From 6808ee35ddaaaa723cab017fa1421bb40240dda6 Mon Sep 17 00:00:00 2001 From: Duck- Date: Wed, 20 Aug 2014 00:45:03 -0400 Subject: [PATCH 3/3] hardcoded dodge nerf -105% chance to hit at 7 tiles no thank you. go away. go home. --- code/modules/projectiles/projectile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index c88b121b..41759378 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -93,7 +93,7 @@ var/obj/item/weapon/gun/daddy = shot_from //Kinda balanced by fact you need like 2 seconds to aim if (daddy.target && original in daddy.target) //As opposed to no-delay pew pew miss_modifier += -30 - def_zone = get_zone_with_miss_chance(def_zone, M, miss_modifier + 15*distance) + def_zone = get_zone_with_miss_chance(def_zone, M, miss_modifier + 5*distance) if(!def_zone) visible_message("\blue \The [src] misses [M] narrowly!")