From 75e13303ea6a940666ec896b2073da041ed63101 Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Mon, 15 Aug 2016 17:51:23 +0100 Subject: [PATCH] Medical, borg and misc tweaks (#714) tweak: "Tweaked surgeon cyborg modules: Added chemistry gripper, removed fire extinguisher, and added soporific to their hypospray." tweak: "Removed chemistry gripper from crisis borg." maptweak: "The chemistry and botany fridges are now see-through, so you can more easily chat with people on the other side." tweak: "Cost of cyborg renaming module vastly decreased" tweak: "Renamed medical's Chemical Closet, to Chemistry Equipment Closet. Nobody ever stores chemicals in an unrefridgerated closet." rscadd: "Added two boxes of empty spraybottles to the chemistry equipment closet." --- .../objects/items/robot/robot_upgrades.dm | 2 +- .../objects/items/weapons/storage/boxes.dm | 17 +++++++- .../crates_lockers/closets/secure/medical.dm | 6 ++- .../mob/living/silicon/robot/robot_modules.dm | 5 +-- .../reagents/reagent_containers/borghydro.dm | 2 +- html/changelogs/Nanako-Smalltweaks.yml | 43 +++++++++++++++++++ maps/exodus-1.dmm | 4 +- 7 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/Nanako-Smalltweaks.yml diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index ae6e3786713..70f5d7e226f 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -43,7 +43,7 @@ name = "robot reclassification board" desc = "Used to rename a cyborg." icon_state = "cyborg_upgrade1" - construction_cost = list(DEFAULT_WALL_MATERIAL=35000) + construction_cost = list(DEFAULT_WALL_MATERIAL=1000) var/heldname = "default name" /obj/item/borg/upgrade/rename/attack_self(mob/user as mob) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index aa3fe35f9b6..f30dd04887b 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -546,6 +546,21 @@ new /obj/item/weapon/storage/pill_bottle( src ) +/obj/item/weapon/storage/box/spraybottles + name = "box of spray bottles" + desc = "It has pictures of spray bottles on its front." + New() + ..() + new /obj/item/weapon/reagent_containers/spray( src ) + new /obj/item/weapon/reagent_containers/spray( src ) + new /obj/item/weapon/reagent_containers/spray( src ) + new /obj/item/weapon/reagent_containers/spray( src ) + new /obj/item/weapon/reagent_containers/spray( src ) + new /obj/item/weapon/reagent_containers/spray( src ) + new /obj/item/weapon/reagent_containers/spray( src ) + + + /obj/item/weapon/storage/box/snappops name = "snap pop box" desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children." @@ -599,7 +614,7 @@ desc = "This box is shaped on the inside so that only light tubes and bulbs fit." item_state = "syringe_kit" use_to_pickup = 1 // for picking up broken bulbs, not that most people will try - + /obj/item/weapon/storage/box/lights/New() ..() make_exact_fit() 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 b798016e6e1..cc333808a05 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -158,8 +158,8 @@ /obj/structure/closet/secure_closet/chemical - name = "chemical closet" - desc = "Store dangerous chemicals in here." + name = "chemistry equipment closet" + desc = "Contains equipment useful to chemists." icon_state = "medical1" icon_closed = "medical" icon_locked = "medical1" @@ -173,6 +173,8 @@ ..() new /obj/item/weapon/storage/box/pillbottles(src) new /obj/item/weapon/storage/box/pillbottles(src) + new /obj/item/weapon/storage/box/spraybottles(src) + new /obj/item/weapon/storage/box/spraybottles(src) return /obj/structure/closet/secure_closet/medical_wall diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 44851831549..ba62e3c7bc9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -204,7 +204,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/weapon/bonesetter(src) src.modules += new /obj/item/weapon/circular_saw(src) src.modules += new /obj/item/weapon/surgicaldrill(src) - src.modules += new /obj/item/weapon/extinguisher/mini(src) + src.modules += new /obj/item/weapon/gripper/chemistry(src) src.emag = new /obj/item/weapon/reagent_containers/spray(src) src.emag.reagents.add_reagent("pacid", 250) src.emag.name = "Polyacid spray" @@ -251,7 +251,6 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/device/reagent_scanner/adv(src) src.modules += new /obj/item/roller_holder(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/crisis(src) - src.modules += new /obj/item/weapon/gripper/chemistry(src) src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) src.modules += new /obj/item/weapon/reagent_containers/syringe(src) src.modules += new /obj/item/weapon/extinguisher/mini(src) @@ -680,7 +679,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/borg/combat/mobility(src) src.emag = new /obj/item/weapon/gun/energy/lasercannon/mounted(src) return - + /obj/item/weapon/robot_module/drone name = "drone module" no_slip = 1 diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 47c80d42a14..dfd64fdff01 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -18,7 +18,7 @@ var/list/reagent_names = list() /obj/item/weapon/reagent_containers/borghypo/surgeon - reagent_ids = list("bicaridine", "inaprovaline", "dexalin") + reagent_ids = list("bicaridine", "inaprovaline", "dexalin", "stoxin") /obj/item/weapon/reagent_containers/borghypo/crisis reagent_ids = list("tricordrazine", "inaprovaline", "tramadol") diff --git a/html/changelogs/Nanako-Smalltweaks.yml b/html/changelogs/Nanako-Smalltweaks.yml new file mode 100644 index 00000000000..46c7e466372 --- /dev/null +++ b/html/changelogs/Nanako-Smalltweaks.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Nanako + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Tweaked surgeon cyborg modules: Added chemistry gripper, removed fire extinguisher, and added soporific to their hypospray." + - tweak: "Removed chemistry gripper from crisis borg." + - maptweak: "The chemistry and botany fridges are now see-through, so you can more easily chat with people on the other side." + - tweak: "Cost of cyborg renaming module vastly decreased" + - tweak: "Renamed medical's Chemical Closet, to Chemistry Equipment Closet. Nobody ever stores chemicals in an unrefridgerated closet." + - rscadd: "Added two boxes of empty spraybottles to the chemistry equipment closet." + + \ No newline at end of file diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index ed79e3a94e3..649e0e3d373 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -2330,7 +2330,7 @@ "aSP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "aSQ" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "aSR" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Hydroponics Pasture"; req_access = list(28)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) -"aSS" = (/obj/machinery/smartfridge,/turf/simulated/wall,/area/crew_quarters/kitchen) +"aSS" = (/obj/machinery/smartfridge,/obj/structure/window/reinforced{dir = 5; layer = 2.8},/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/kitchen) "aST" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "aSU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "aSV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) @@ -3849,7 +3849,7 @@ "bwa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/chemistry) "bwb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/chemistry) "bwc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/chemistry) -"bwd" = (/obj/machinery/smartfridge/secure/medbay{req_one_access = list(33,66)},/turf/simulated/wall,/area/medical/chemistry) +"bwd" = (/obj/structure/window/reinforced{dir = 5; layer = 2.8},/obj/machinery/smartfridge/secure/medbay{req_one_access = list(33,66)},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bwe" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{name = "Chemistry Laboratory"; req_access = list(33)},/obj/structure/sign/chemistry{pixel_x = 32},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bwf" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayrecquar"; name = "Medbay Emergency Quarantine Shutters"; opacity = 0},/turf/simulated/floor,/area/medical/reception) "bwg" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayrecquar"; name = "Medbay Emergency Quarantine Shutters"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/medical/reception)