mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
More work on CentCom.
CentCom Special Ops shuttle updates. Removed gib implants from SS13 until we figure out what to do with them. They are now located on CentCom for a future revision. Added air alarms to Fore Primary Hallway. Disintegrate now leaves different remains for robots and aliens. Misc fixes. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@628 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -96,6 +96,14 @@
|
|||||||
/area/shuttle/prison/prison
|
/area/shuttle/prison/prison
|
||||||
icon_state = "shuttle2"
|
icon_state = "shuttle2"
|
||||||
|
|
||||||
|
/area/shuttle/specialops/centcom
|
||||||
|
name = "Special Ops Shuttle"
|
||||||
|
icon_state = "shuttlered"
|
||||||
|
|
||||||
|
/area/shuttle/specialops/station
|
||||||
|
name = "Special Ops Shuttle"
|
||||||
|
icon_state = "shuttlered2"
|
||||||
|
|
||||||
/area/shuttle/thunderdome
|
/area/shuttle/thunderdome
|
||||||
name = "honk"
|
name = "honk"
|
||||||
|
|
||||||
|
|||||||
@@ -5,11 +5,25 @@
|
|||||||
icon_state = "ash"
|
icon_state = "ash"
|
||||||
anchored = 1
|
anchored = 1
|
||||||
|
|
||||||
/obj/decal/disintegrated
|
/obj/decal/remains/human
|
||||||
name = "remains"
|
name = "remains"
|
||||||
desc = "These remains have a strange sense about them.."
|
desc = "These remains have a strange sense about them..."
|
||||||
icon = 'blood.dmi'
|
icon = 'blood.dmi'
|
||||||
icon_state = "disintegrated"
|
icon_state = "remains"
|
||||||
|
anchored = 1
|
||||||
|
|
||||||
|
/obj/decal/remains/xeno
|
||||||
|
name = "remains"
|
||||||
|
desc = "These remains have a strange sense about them..."
|
||||||
|
icon = 'blood.dmi'
|
||||||
|
icon_state = "remainsxeno"
|
||||||
|
anchored = 1
|
||||||
|
|
||||||
|
/obj/decal/remains/robot
|
||||||
|
name = "remains"
|
||||||
|
desc = "These remains have a strange sense about them..."
|
||||||
|
icon = 'robots.dmi'
|
||||||
|
icon_state = "remainsrobot"
|
||||||
anchored = 1
|
anchored = 1
|
||||||
|
|
||||||
/obj/decal/point
|
/obj/decal/point
|
||||||
|
|||||||
@@ -1949,13 +1949,16 @@ Originally created for wizard disintegrate. I've removed the virus code since it
|
|||||||
animation.master = src
|
animation.master = src
|
||||||
if(ishuman(src))
|
if(ishuman(src))
|
||||||
flick("dust-h", animation)
|
flick("dust-h", animation)
|
||||||
|
new /obj/decal/remains/human(src.loc)
|
||||||
else if(ismonkey(src))
|
else if(ismonkey(src))
|
||||||
flick("dust-m", animation)
|
flick("dust-m", animation)
|
||||||
|
new /obj/decal/remains/human(src.loc)
|
||||||
else if(isalien(src))
|
else if(isalien(src))
|
||||||
flick("dust-a", animation)
|
flick("dust-a", animation)
|
||||||
|
new /obj/decal/remains/xeno(src.loc)
|
||||||
else
|
else
|
||||||
flick("dust-r", animation)
|
flick("dust-r", animation)
|
||||||
new /obj/decal/disintegrated(src.loc)
|
new /obj/decal/remains/robot(src.loc)
|
||||||
|
|
||||||
if (src.client)
|
if (src.client)
|
||||||
var/mob/dead/observer/newmob
|
var/mob/dead/observer/newmob
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 17 KiB |
12498
maps/tgstation.2.0.0.dmm
12498
maps/tgstation.2.0.0.dmm
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user