mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
Updated the faithless health/damage and the wildwest map to have rig suits on the miner corpses. I'd already edited this locally on the /tg/station servers, so our players shouldn't notice any difference.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5150 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -187,6 +187,12 @@
|
||||
corpseidjob = "Shaft Miner"
|
||||
corpseidaccess = "Shaft Miner"
|
||||
|
||||
/obj/effect/landmark/corpse/miner/rig
|
||||
corpsesuit = /obj/item/clothing/suit/space/rig/mining
|
||||
corpsemask = /obj/item/clothing/mask/breath
|
||||
corpsehelmet = /obj/item/clothing/head/helmet/space/rig/mining
|
||||
|
||||
|
||||
/////////////////Officers//////////////////////
|
||||
|
||||
/obj/effect/landmark/corpse/bridgeofficer
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
response_harm = "hits the"
|
||||
speed = -1
|
||||
stop_automated_movement_when_pulled = 0
|
||||
maxHealth = 100
|
||||
health = 100
|
||||
maxHealth = 80
|
||||
health = 80
|
||||
|
||||
harm_intent_damage = 10
|
||||
melee_damage_lower = 18
|
||||
melee_damage_upper = 18
|
||||
melee_damage_lower = 15
|
||||
melee_damage_upper = 15
|
||||
attacktext = "grips"
|
||||
attack_sound = 'sound/hallucinations/growl1.ogg'
|
||||
|
||||
@@ -42,6 +42,6 @@
|
||||
. =..()
|
||||
var/mob/living/L = .
|
||||
if(istype(L))
|
||||
if(prob(15))
|
||||
if(prob(12))
|
||||
L.Weaken(3)
|
||||
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
|
||||
@@ -31,7 +31,7 @@
|
||||
"aE" = (/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/space,/area)
|
||||
"aF" = (/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/simulated/mineral,/area)
|
||||
"aG" = (/obj/machinery/door/airlock/vault{locked = 1},/turf/simulated/floor/engine/cult,/area/awaymission/wwvault)
|
||||
"aH" = (/obj/effect/landmark/corpse/miner,/turf/simulated/floor/engine/cult,/area/awaymission/wwvault)
|
||||
"aH" = (/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/engine/cult,/area/awaymission/wwvault)
|
||||
"aI" = (/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/simulated/mineral,/area/awaymission/wwmines)
|
||||
"aJ" = (/turf/simulated/mineral/silver,/area/awaymission/wwmines)
|
||||
"aK" = (/turf/simulated/mineral,/area/awaymission/wwmines)
|
||||
@@ -54,7 +54,7 @@
|
||||
"bb" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
|
||||
"bc" = (/turf/simulated/wall/mineral/sandstone,/area)
|
||||
"bd" = (/obj/structure/largecrate,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
|
||||
"be" = (/obj/effect/landmark/corpse/miner,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
|
||||
"be" = (/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
|
||||
"bf" = (/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"bg" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"bh" = (/obj/effect/decal/cleanable/blood/gibs/body{tag = "icon-gibup1"; icon_state = "gibup1"},/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
@@ -62,7 +62,7 @@
|
||||
"bj" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
|
||||
"bk" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
|
||||
"bl" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"bm" = (/obj/effect/landmark/corpse/miner,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
|
||||
"bm" = (/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
|
||||
"bn" = (/obj/structure/lattice,/turf/space,/area)
|
||||
"bo" = (/obj/effect/mine/dnascramble,/obj/item/ammo_magazine/a12mm,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"bp" = (/obj/structure/closet/crate,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
|
||||
@@ -172,7 +172,7 @@
|
||||
"dp" = (/obj/effect/mine/plasma,/obj/item/ammo_magazine/a12mm,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"dq" = (/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
|
||||
"dr" = (/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand4"; icon_state = "ironsand4"},/area/awaymission/wwgov)
|
||||
"ds" = (/obj/effect/landmark/corpse/miner,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"ds" = (/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"dt" = (/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand12"; icon_state = "ironsand12"},/area/awaymission/wwgov)
|
||||
"du" = (/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand14"; icon_state = "ironsand14"},/area/awaymission/wwgov)
|
||||
"dv" = (/obj/structure/toilet,/obj/effect/critter/creature,/turf/simulated/floor{tag = "icon-white"; icon_state = "white"},/area/awaymission/wwgov)
|
||||
@@ -235,7 +235,7 @@
|
||||
"eA" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand7"; icon_state = "ironsand7"},/area/awaymission/wwgov)
|
||||
"eB" = (/obj/structure/sign/vacuum,/turf/simulated/wall/r_wall,/area/awaymission/wwrefine)
|
||||
"eC" = (/obj/effect/decal/mecha_wreckage/gygax{anchored = 1},/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
|
||||
"eD" = (/obj/effect/decal/cleanable/blood/splatter,/obj/effect/landmark/corpse/miner,/turf/simulated/floor/carpet,/area/awaymission/wwmines)
|
||||
"eD" = (/obj/effect/decal/cleanable/blood/splatter,/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/carpet,/area/awaymission/wwmines)
|
||||
"eE" = (/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/wall/mineral/sandstone,/area/awaymission/wwmines)
|
||||
"eF" = (/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand14"; icon_state = "ironsand14"},/area/awaymission/wwgov)
|
||||
"eG" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced{tag = "icon-fwindow (NORTH)"; icon_state = "fwindow"; dir = 1},/obj/structure/grille,/turf/simulated/floor,/area/awaymission/wwrefine)
|
||||
@@ -288,7 +288,7 @@
|
||||
"fB" = (/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/obj/structure/lattice,/turf/space,/area)
|
||||
"fC" = (/obj/effect/decal/mecha_wreckage/ripley/deathripley{anchored = 1},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
|
||||
"fD" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
|
||||
"fE" = (/obj/effect/mine/dnascramble,/obj/effect/landmark/corpse/miner,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"fE" = (/obj/effect/mine/dnascramble,/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"fF" = (/obj/structure/table/woodentable,/obj/item/weapon/gun/projectile/shotgun,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"fG" = (/obj/structure/stool/bed/chair/wood/normal,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/wwmines)
|
||||
"fH" = (/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/turf/simulated/floor/grass,/area/awaymission/wwgov)
|
||||
@@ -300,7 +300,7 @@
|
||||
"fN" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{tag = "icon-fwindow"; icon_state = "fwindow"},/turf/simulated/floor/grass,/area/awaymission/wwgov)
|
||||
"fO" = (/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/turf/simulated/floor,/area)
|
||||
"fP" = (/turf/simulated/floor,/area)
|
||||
"fQ" = (/obj/effect/landmark/corpse/miner,/turf/simulated/floor,/area/awaymission/wwrefine)
|
||||
"fQ" = (/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor,/area/awaymission/wwrefine)
|
||||
"fR" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"fS" = (/obj/structure/table/woodentable,/obj/item/weapon/gun/projectile/russian,/turf/simulated/floor/wood,/area/awaymission/wwmines)
|
||||
"fT" = (/obj/structure/stool/bed/chair/wood/normal{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/wwmines)
|
||||
|
||||
Reference in New Issue
Block a user