cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Readded gloves to the lockers in atmos, mining, cargo, and robotics.

Browse Source 
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5240 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-12-01 01:42:10 +00:00
parent 4dab53f771
commit e550f54ad3
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -14,7 +14,7 @@
new /obj/item/clothing/under/rank/cargotech(src) new /obj/item/clothing/under/rank/cargotech(src)
new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src)
new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/device/radio/headset/headset_cargo(src)
// new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/soft(src) new /obj/item/clothing/head/soft(src)
// new /obj/item/weapon/cartridge/quartermaster(src) // new /obj/item/weapon/cartridge/quartermaster(src)
return return

2
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -226,6 +226,8 @@
new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/suit/labcoat(src)
new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/gloves/black(src)
return return

2
code/modules/mining/mine_items.dm
View File

@@ -28,7 +28,7 @@
new /obj/item/weapon/storage/backpack/satchel_eng(src) new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/device/radio/headset/headset_mine(src) new /obj/item/device/radio/headset/headset_mine(src)
new /obj/item/clothing/under/rank/miner(src) new /obj/item/clothing/under/rank/miner(src)
// new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src)
new /obj/item/device/analyzer(src) new /obj/item/device/analyzer(src)
new /obj/item/weapon/storage/satchel(src) new /obj/item/weapon/storage/satchel(src)

2
html/changelog.html
View File

@@ -57,7 +57,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
<h3 class="author">Ikarrus updated:</h3> <h3 class="author">Ikarrus updated:</h3>
<ul class="changes bgimages16"> <ul class="changes bgimages16">
<li class="tweak">Swapped the locations of the Vault and Tech Storage.</li> <li class="tweak">Swapped the locations of the Vault and Tech Storage.</li>
<li class="rscdel">Cargo Techs, Miners, and Roboticists no longer start with gloves.</li> <li class="rscdel">Cargo Techs, Miners, and Roboticists no longer start with gloves. They are still available from their lockers.</li>
</ul> </ul>
</div> </div>

4
maps/tgstation.2.0.9.dmm
View File

@@ -4940,7 +4940,7 @@
"bQZ" = (/obj/machinery/atmospherics/pipe/manifold{tag = "icon-manifold-r (EAST)"; icon_state = "manifold-r"; dir = 4; level = 2; color = "red"},/turf/simulated/floor,/area/atmos) "bQZ" = (/obj/machinery/atmospherics/pipe/manifold{tag = "icon-manifold-r (EAST)"; icon_state = "manifold-r"; dir = 4; level = 2; color = "red"},/turf/simulated/floor,/area/atmos)
"bRa" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/atmos) "bRa" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/atmos)
"bRb" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/atmos) "bRb" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/atmos)
"bRc" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/machinery/light,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/turf/simulated/floor,/area/atmos) "bRc" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/machinery/light,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/turf/simulated/floor,/area/atmos)
"bRd" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8; icon_state = "manifold"; level = 2},/turf/simulated/floor,/area/atmos) "bRd" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8; icon_state = "manifold"; level = 2},/turf/simulated/floor,/area/atmos)
"bRe" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos) "bRe" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos)
"bRf" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4; icon_state = "manifold"; initialize_directions = 11; level = 2},/turf/simulated/floor,/area/atmos) "bRf" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4; icon_state = "manifold"; initialize_directions = 11; level = 2},/turf/simulated/floor,/area/atmos)
@@ -5755,7 +5755,7 @@
"cgI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/engine/engineering) "cgI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/engine/engineering)
"cgJ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor,/area/engine/engineering) "cgJ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor,/area/engine/engineering)
"cgK" = (/obj/structure/table,/obj/item/weapon/book/manual/engineering_hacking{pixel_x = 3; pixel_y = 3},/obj/item/weapon/book/manual/engineering_construction,/turf/simulated/floor,/area/engine/engineering) "cgK" = (/obj/structure/table,/obj/item/weapon/book/manual/engineering_hacking{pixel_x = 3; pixel_y = 3},/obj/item/weapon/book/manual/engineering_construction,/turf/simulated/floor,/area/engine/engineering)
"cgL" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/extinguisher{pixel_x = 8},/turf/simulated/floor,/area/engine/engineering) "cgL" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/black,/obj/item/weapon/extinguisher{pixel_x = 8},/turf/simulated/floor,/area/engine/engineering)
"cgM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering) "cgM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering)
"cgN" = (/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/engine/engineering) "cgN" = (/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/engine/engineering)
"cgO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/engine/engineering) "cgO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/engine/engineering)