cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[orion trail] Styling issues + refactor

Browse Source 
https://github.com/ParadiseSS13/Paradise/pull/14503
This commit is contained in:
further-reading
2020-10-01 21:08:44 +01:00
parent 3a078b96a5
commit b1bf22acf4
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/arcade.dm
+17 -16
View File
@@ -571,24 +571,25 @@
event = null
else if(href_list["killcrew"]) //shoot a crewmember
if(settlers.len > 0 || alive > 0)
var/sheriff = remove_crewmember() //I shot the sheriff
playsound(loc,'sound/weapons/gunshots/gunshot.ogg', 100, 1)
if(length(settlers) <= 0 || alive <= 0)
return
var/sheriff = remove_crewmember() //I shot the sheriff
playsound(loc, 'sound/weapons/gunshots/gunshot.ogg', 100, 1)
if(settlers.len == 0 || alive == 0)
atom_say("The last crewmember [sheriff], shot themselves, GAME OVER!")
if(emagged)
usr.death(0)
emagged = 0
gameover = 1
event = null
else if(emagged)
if(usr.name == sheriff)
atom_say("The crew of the ship chose to kill [usr.name]!")
usr.death(0)
if(length(settlers) == 0 || alive == 0)
atom_say("The last crewmember [sheriff], shot themselves, GAME OVER!")
if(emagged)
usr.death(FALSE)
emagged = FALSE
gameover = TRUE
event = null
else if(emagged)
if(usr.name == sheriff)
atom_say("The crew of the ship chose to kill [usr.name]!")
usr.death(FALSE)
if(event == ORION_TRAIL_LING) //only ends the ORION_TRAIL_LING event, since you can do this action in multiple places
event = null
if(event == ORION_TRAIL_LING) //only ends the ORION_TRAIL_LING event, since you can do this action in multiple places
event = null
//Spaceport specific interactions
//they get a header because most of them don't reset event (because it's a shop, you leave when you want to)