From dde9d121a20e709645376bc47461b139dae6cb8f Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Tue, 11 Dec 2012 22:01:25 +0000 Subject: [PATCH] Fixes issue 1154. Slime Jam Not Appearing Nerfed the janicart ricochet chance a bit. Removed the coolness check from the det revolver. Removed the det revolver from the map, and made it spawn in his locker. You can now modify the det revolver to fire .357 with a screwdriver. Fixed the det revolver having one round too many. S&W Model 10 only has six shots. Updated some guncode, mostly just adding proper text styles. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5297 316c924e-a436-60f5-8080-3fe189b3f50e --- .../crates_lockers/closets/secure/security.dm | 5 +- code/game/objects/structures/janicart.dm | 2 +- code/modules/projectiles/ammunition/boxes.dm | 2 +- code/modules/projectiles/gun.dm | 16 ++--- .../projectiles/guns/projectile/revolver.dm | 64 ++++++++++++++---- code/modules/reagents/Chemistry-Recipes.dm | 2 +- html/changelog.html | 7 ++ icons/obj/ammo.dmi | Bin 4143 -> 4197 bytes maps/tgstation.2.0.9.dmm | 4 +- 9 files changed, 70 insertions(+), 32 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 360176c549e..4c2e77bc64e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -173,7 +173,6 @@ ..() sleep(2) new /obj/item/clothing/under/det(src) - new /obj/item/clothing/suit/armor/det_suit(src) new /obj/item/clothing/suit/det_suit(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/head/det_hat(src) @@ -183,6 +182,10 @@ new /obj/item/weapon/clipboard(src) new /obj/item/device/detective_scanner(src) new /obj/item/weapon/storage/box/evidence(src) + new /obj/item/clothing/suit/armor/det_suit(src) + new /obj/item/ammo_magazine/c38(src) + new /obj/item/ammo_magazine/c38(src) + new /obj/item/weapon/gun/projectile/detective(src) return /obj/structure/closet/secure_closet/detective/update_icon() diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index fabeb724097..d801b486428 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -121,7 +121,7 @@ /obj/structure/stool/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj) if(buckled_mob) - if(prob(50)) + if(prob(65)) return buckled_mob.bullet_act(Proj) visible_message("[Proj] ricochets off the pimpin' ride!") diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index ba89628d03e..fa7567bcb28 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -10,7 +10,7 @@ name = "speed loader (.38)" icon_state = "38" ammo_type = "/obj/item/ammo_casing/c38" - max_ammo = 7 + max_ammo = 6 multiple_sprites = 1 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index fbba8b87be9..649ad6fef16 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -25,17 +25,9 @@ proc/load_into_chamber() - return - - proc/special_check(var/mob/M) - return - - - load_into_chamber() return 0 - - special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver. + proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver. return 1 @@ -49,11 +41,11 @@ if(istype(target, /obj/machinery/recharger) && istype(src, /obj/item/weapon/gun/energy)) return//Shouldnt flag take care of this? //Exclude lasertag guns from the CLUMSY check. - if(src.clumsy_check) + if(clumsy_check) if(istype(user, /mob/living)) var/mob/living/M = user if ((CLUMSY in M.mutations) && prob(50)) - M << "\red The [src.name] blows up in your face." + M << "[src] blows up in your face." M.take_organ_damage(0,20) M.drop_item() del(src) @@ -102,7 +94,7 @@ playsound(user, fire_sound, 10, 1) else playsound(user, fire_sound, 50, 1) - user.visible_message("\red [user.name] fires the [src.name]!", "\red You fire the [src.name]!", "\blue You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") + user.visible_message("[user] fires [src]!", "You fire [src]!", "You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") in_chamber.original = target in_chamber.loc = get_turf(user) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 1974b1adde8..9b9ea0f9b61 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -2,19 +2,22 @@ desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds." name = "revolver" icon_state = "detective" + max_shells = 6 caliber = "38" origin_tech = "combat=2;materials=2" ammo_type = "/obj/item/ammo_casing/c38" special_check(var/mob/living/carbon/human/M) - if(ishuman(M)) - if(istype(M.w_uniform, /obj/item/clothing/under/det) && istype(M.head, /obj/item/clothing/head/det_hat) && \ - (istype(M.wear_suit, /obj/item/clothing/suit/det_suit) || istype(M.wear_suit, /obj/item/clothing/suit/armor/det_suit))) - return 1 - M << "\red You just don't feel cool enough to use this gun looking like that." - return 0 - + if(caliber == initial(caliber)) + return 1 + if(prob(70 - (loaded.len * 10))) //minimum probability of 10, maximum of 60 + M << "[src] blows up in your face." + M.take_organ_damage(0,20) + M.drop_item() + del(src) + return 0 + return 1 verb/rename_gun() set name = "Name Gun" @@ -24,7 +27,7 @@ var/mob/M = usr if(!M.mind) return 0 if(!M.mind.assigned_role == "Detective") - M << "\red You don't feel cool enough to name this gun, chump." + M << "You don't feel cool enough to name this gun, chump." return 0 var/input = stripped_input(usr,"What do you want to name the gun?", ,"", MAX_NAME_LEN) @@ -34,11 +37,44 @@ M << "You name the gun [input]. Say hello to your new friend." return 1 + attackby(var/obj/item/A as obj, mob/user as mob) + ..() + if(istype(A, /obj/item/weapon/screwdriver)) + if(caliber == "38") + user << "You begin to reinforce the barrel of [src]." + if(loaded.len) + afterattack(user, user) //you know the drill + playsound(user, fire_sound, 50, 1) + user.visible_message("[src] goes off!", "[src] goes off in your face!") + return + if(do_after(user, 30)) + if(loaded.len) + user << "You can't modify it!" + return + caliber = "357" + desc = "The barrel and chamber assembly seems to have been modified." + user << "You reinforce the barrel of [src]! Now it will fire .357 rounds." + else + user << "You begin to revert the modifications to [src]." + if(loaded.len) + afterattack(user, user) //and again + playsound(user, fire_sound, 50, 1) + user.visible_message("[src] goes off!", "[src] goes off in your face!") + return + if(do_after(user, 30)) + if(loaded.len) + user << "You can't modify it!" + return + caliber = "38" + desc = initial(desc) + user << "You remove the modifications on [src]! Now it will fire .38 rounds." + + /obj/item/weapon/gun/projectile/mateba name = "mateba" - desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo." + desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo." //>10mm hole >.357 icon_state = "mateba" origin_tech = "combat=2;materials=2" @@ -47,7 +83,7 @@ /obj/item/weapon/gun/projectile/russian name = "Russian Revolver" - desc = "A Russian made revolver. Uses 357 ammo. It has a single slot in it's chamber for a bullet." + desc = "A Russian made revolver. Uses .357 ammo. It has a single slot in it's chamber for a bullet." max_shells = 6 origin_tech = "combat=2;materials=2" @@ -89,9 +125,9 @@ A.update_icon() if(num_loaded) - user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.") + user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.") else - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") + user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") if(getAmmo() > 0) Spin() update_icon() @@ -99,7 +135,7 @@ /obj/item/weapon/gun/projectile/russian/attack_self(mob/user as mob) - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") + user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") if(getAmmo() > 0) Spin() @@ -122,7 +158,7 @@ return var/obj/item/projectile/P = new AC.projectile_type playsound(user, fire_sound, 50, 1) - user.visible_message("\red [user.name] fires the [src.name] at his head!", "\red You fire the [src.name] at your head!", "\blue You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") + user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") if(!P.nodamage) user.apply_damage(300, BRUTE, affecting) // You are dead, dead, dead. return diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 61e818527db..8d5f47560a8 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -662,7 +662,7 @@ datum slimejam name = "Slime Jam" id = "m_jam" - result = "slime" + result = "slime Jelly" required_reagents = list("water" = 1) result_amount = 1 required_container = /obj/item/slime_core diff --git a/html/changelog.html b/html/changelog.html index 3fcc55f0e69..b77c2bdf918 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,13 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

11 December 2012

+

Petethegoat updated:

+ +

07 December 2012

Giacom updated:

diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 95d88d303af90060e9fc837d34bd93b9096c33cc..8ca8da77f7420d0682d911208c1168cef76d38be 100644 GIT binary patch delta 3897 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 diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index aa85da7c0da..f0aca69817d 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -817,7 +817,7 @@ "apK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "apL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "apM" = (/obj/structure/closet/secure_closet/detective,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) -"apN" = (/obj/structure/table/woodentable,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/item/weapon/folder/red,/obj/item/weapon/hand_labeler,/obj/item/device/taperecorder{pixel_y = 0},/turf/simulated/floor/carpet,/area/security/detectives_office) +"apN" = (/obj/structure/table/woodentable,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/item/weapon/folder/red,/obj/item/weapon/hand_labeler,/turf/simulated/floor/carpet,/area/security/detectives_office) "apO" = (/obj/effect/landmark/start{name = "Detective"},/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor/carpet,/area/security/detectives_office) "apP" = (/obj/machinery/computer/security/wooden_tv,/obj/machinery/newscaster{pixel_x = 28},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apQ" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/wood,/area/lawoffice) @@ -902,7 +902,7 @@ "arr" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ars" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "art" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall,/area/security/detectives_office) -"aru" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/obj/structure/table/woodentable,/obj/item/ammo_magazine/c38,/obj/item/ammo_magazine/c38,/obj/item/weapon/gun/projectile/detective,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) +"aru" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/obj/structure/table/woodentable,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/taperecorder{pixel_y = 0},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "arv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "arw" = (/obj/machinery/camera{c_tag = "Detective's Office"; dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "arx" = (/obj/machinery/computer/med_data,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)