cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pathing Tweaks (#1719)

Browse Source 
* Edits some pathing references

* Cleans up a spacing thing

* Map thing

* Adds the \improper tag to NT breacher gear, for improved grammar
This commit is contained in:
Anewbe
2016-05-28 11:17:41 -05:00
committed by Yoshax
parent 19102ea3f3
commit 1d3a57cd76
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/antagonist/outsider/raider.dm
View File

@@ -207,7 +207,7 @@ var/datum/antagonist/raider/raiders
player.equip_to_slot_or_del(new new_shoes(player),slot_shoes) player.equip_to_slot_or_del(new new_shoes(player),slot_shoes)
if(!player.shoes) if(!player.shoes)
//If equipping shoes failed, fall back to equipping sandals //If equipping shoes failed, fall back to equipping sandals
var/fallback_type = pick(/obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/jackboots/unathi) var/fallback_type = pick(/obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/jackboots/toeless)
player.equip_to_slot_or_del(new fallback_type(player), slot_shoes) player.equip_to_slot_or_del(new fallback_type(player), slot_shoes)
player.equip_to_slot_or_del(new new_uniform(player),slot_w_uniform) player.equip_to_slot_or_del(new new_uniform(player),slot_w_uniform)

2
code/modules/client/preference_setup/loadout/loadout_shoes.dm
View File

@@ -7,7 +7,7 @@
/datum/gear/shoes/toeless /datum/gear/shoes/toeless
display_name = "toe-less jackboots" display_name = "toe-less jackboots"
path = /obj/item/clothing/shoes/jackboots/unathi path = /obj/item/clothing/shoes/jackboots/toeless
/datum/gear/shoes/workboots /datum/gear/shoes/workboots
display_name = "workboots" display_name = "workboots"

2
code/modules/clothing/shoes/jobs.dm
View File

@@ -17,7 +17,7 @@
siemens_coefficient = 0.7 siemens_coefficient = 0.7
can_hold_knife = 1 can_hold_knife = 1
/obj/item/clothing/shoes/jackboots/unathi /obj/item/clothing/shoes/jackboots/toeless
name = "toe-less jackboots" name = "toe-less jackboots"
desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws." desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
item_state = "digiboots" item_state = "digiboots"

20
code/modules/clothing/spacesuits/rig/suits/alien.dm
View File

@@ -1,7 +1,7 @@
/obj/item/weapon/rig/unathi /obj/item/weapon/rig/breacher
name = "NT breacher chassis control module" name = "\improper NT breacher chassis control module"
desc = "A cheap NT knock-off of an Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow." desc = "A cheap NT knock-off of an Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow."
suit_type = "NT breacher" suit_type = "\improper NT breacher"
icon_state = "breacher_rig_cheap" icon_state = "breacher_rig_cheap"
armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 70, bio = 100, rad = 50) armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 70, bio = 100, rad = 50)
emp_protection = -20 emp_protection = -20
@@ -10,11 +10,11 @@
vision_restriction = 1 vision_restriction = 1
offline_vision_restriction = 2 offline_vision_restriction = 2
chest_type = /obj/item/clothing/suit/space/rig chest_type = /obj/item/clothing/suit/space/rig/breacher
helm_type = /obj/item/clothing/head/helmet/space/rig/unathi helm_type = /obj/item/clothing/head/helmet/space/rig/breacher
boot_type = /obj/item/clothing/shoes/magboots/rig/unathi boot_type = /obj/item/clothing/shoes/magboots/rig/breacher
/obj/item/weapon/rig/unathi/fancy /obj/item/weapon/rig/breacher/fancy
name = "breacher chassis control module" name = "breacher chassis control module"
desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank." desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank."
suit_type = "breacher chassis" suit_type = "breacher chassis"
@@ -22,12 +22,12 @@
armor = list(melee = 90, bullet = 90, laser = 90, energy = 90, bomb = 90, bio = 100, rad = 80) //Takes TEN TIMES as much damage to stop someone in a breacher. In exchange, it's slow. armor = list(melee = 90, bullet = 90, laser = 90, energy = 90, bomb = 90, bio = 100, rad = 80) //Takes TEN TIMES as much damage to stop someone in a breacher. In exchange, it's slow.
vision_restriction = 0 vision_restriction = 0
/obj/item/clothing/head/helmet/space/rig/unathi /obj/item/clothing/head/helmet/space/rig/breacher
species_restricted = list("Unathi") species_restricted = list("Unathi")
force = 5 force = 5
/obj/item/clothing/suit/space/rig/unathi /obj/item/clothing/suit/space/rig/breacher
species_restricted = list("Unathi") species_restricted = list("Unathi")
/obj/item/clothing/shoes/magboots/rig/unathi /obj/item/clothing/shoes/magboots/rig/breacher
species_restricted = list("Unathi") species_restricted = list("Unathi")

2
maps/polaris-1.dmm
View File

@@ -6783,7 +6783,7 @@
"cCR" = (/obj/structure/table/reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cCR" = (/obj/structure/table/reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
"cCS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/checkpoint2) "cCS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/checkpoint2)
"cCT" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/head/helmet/space/skrell/black,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/black,/obj/item/clothing/head/helmet/space/skrell/white,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/white,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cCT" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/head/helmet/space/skrell/black,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/black,/obj/item/clothing/head/helmet/space/skrell/white,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/white,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"cCU" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/rig/unathi,/obj/item/clothing/mask/breath,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cCU" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/rig/breacher,/obj/item/clothing/mask/breath,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"cCV" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor,/area/maintenance/evahallway) "cCV" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor,/area/maintenance/evahallway)
"cCW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway) "cCW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway)
"cCX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/maintenance/evahallway) "cCX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/maintenance/evahallway)