mirror of
https://github.com/cybergirlvannie/OpenSS13.git
synced 2026-07-09 14:53:13 +01:00
One step towards plasma changes (though I might not complete them), and drone control is released when the user logs out.
This commit is contained in:
@@ -88,6 +88,7 @@ obj/machinery/atmoalter/canister
|
||||
var/t = src.t_per
|
||||
if (src.t_per > t2)
|
||||
t = t2
|
||||
|
||||
src.holding.gas.transfer_from(src.gas, t)
|
||||
else // If not holding a tank, release gas into the turf
|
||||
if (T)
|
||||
|
||||
+19
-7
@@ -220,7 +220,10 @@
|
||||
if (src.sl_gas > 0)
|
||||
src.sl_gas--
|
||||
if (src.poison > 100000.0)
|
||||
src.overlays = list( plmaster )
|
||||
if (config.plasma_danger && (src.temp >= 150.0 + T20C))
|
||||
src.overlays = list( liquidplmaster )
|
||||
else
|
||||
src.overlays = list( plmaster )
|
||||
else
|
||||
if (src.sl_gas > 101000.0)
|
||||
src.overlays = list( slmaster )
|
||||
@@ -299,8 +302,11 @@
|
||||
src.temp = totemp / divideby
|
||||
if (src.sl_gas > 0)
|
||||
src.sl_gas--
|
||||
if (src.poison > 100000.0)
|
||||
src.overlays = list( plmaster )
|
||||
if (src.poison > 100000.0)
|
||||
if (config.plasma_danger && (src.temp >= 150.0 + T20C))
|
||||
src.overlays = list( liquidplmaster )
|
||||
else
|
||||
src.overlays = list( plmaster )
|
||||
else
|
||||
if (src.sl_gas > 101000.0)
|
||||
src.overlays = list( slmaster )
|
||||
@@ -1064,8 +1070,11 @@ turf/proc/tot_old_gas()
|
||||
src.temp = totemp / divideby
|
||||
if (src.sl_gas > 0)
|
||||
src.sl_gas--
|
||||
if (src.poison > 100000.0)
|
||||
src.overlays = list( plmaster )
|
||||
if (src.poison > 100000.0)
|
||||
if (config.plasma_danger && (src.temp >= 150.0 + T20C))
|
||||
src.overlays = list( liquidplmaster )
|
||||
else
|
||||
src.overlays = list( plmaster )
|
||||
else
|
||||
if (src.sl_gas > 101000.0)
|
||||
src.overlays = list( slmaster )
|
||||
@@ -1213,8 +1222,11 @@ turf/proc/tot_old_gas()
|
||||
src.temp = totemp / divideby
|
||||
if (src.sl_gas > 0)
|
||||
src.sl_gas--
|
||||
if (src.poison > 100000.0)
|
||||
src.overlays = list( plmaster )
|
||||
if (src.poison > 100000.0)
|
||||
if (config.plasma_danger && (src.temp >= 150.0 + T20C))
|
||||
src.overlays = list( liquidplmaster )
|
||||
else
|
||||
src.overlays = list( plmaster )
|
||||
else
|
||||
if (src.sl_gas > 101000.0)
|
||||
src.overlays = list( slmaster )
|
||||
|
||||
@@ -1275,6 +1275,7 @@
|
||||
H.memory += text("<B>Secret Base Nuke Code</B>: []<BR>", nuke_code)
|
||||
//Foreach goto(312)
|
||||
sleep(50)
|
||||
|
||||
plmaster = new /obj/overlay( )
|
||||
plmaster.icon = 'plasma.dmi'
|
||||
plmaster.icon_state = "onturf"
|
||||
@@ -1282,7 +1283,11 @@
|
||||
slmaster = new /obj/overlay( )
|
||||
slmaster.icon = 'plasma.dmi'
|
||||
slmaster.icon_state = "sl_gas"
|
||||
slmaster.layer = FLY_LAYER
|
||||
slmaster.layer = FLY_LAYER
|
||||
liquidplmaster = new /obj/overlay( )
|
||||
liquidplmaster.icon = 'plasma.dmi'
|
||||
liquidplmaster.icon_state = "liquid"
|
||||
liquidplmaster.layer = FLY_LAYER
|
||||
cellcontrol = new /datum/control/cellular( )
|
||||
spawn( 0 )
|
||||
cellcontrol.process()
|
||||
|
||||
+3
-2
@@ -104,8 +104,8 @@ var
|
||||
|
||||
world_message = "Welcome to OpenSS13!"
|
||||
savefile_ver = "4"
|
||||
SS13_version = "1.0 \[Development Version] - 6/20/2008"
|
||||
changes = {"<FONT color='blue'><H1>Version: [SS13_version]</H1><B>Changes from base version 40.93.2</B></FONT><BR>
|
||||
SS13_version = "1.0 \[Development Version] - 6/21/2008"
|
||||
changes = {"<FONT color='blue'><H3>Version: [SS13_version]</H3><B>Changes from base version 40.93.2</B></FONT><BR>
|
||||
<HR>
|
||||
<!--
|
||||
<p><B>This is a test version which hasn't been released yet, the reason being to test new bugfixes and/or features to see if they're all working without having broken anything else.
|
||||
@@ -355,6 +355,7 @@ var
|
||||
datum/control/gameticker/ticker = null
|
||||
obj/datacore/data_core = null
|
||||
obj/overlay/plmaster = null
|
||||
obj/overlay/liquidplmaster = null
|
||||
obj/overlay/slmaster = null
|
||||
going = 1.0
|
||||
master_mode = "random"//"extended"
|
||||
|
||||
@@ -711,6 +711,20 @@
|
||||
src.stunned = 1
|
||||
return
|
||||
|
||||
Logout()
|
||||
if (src.droneTransitioning==1)
|
||||
..()
|
||||
return
|
||||
src.releaseControl(0)
|
||||
|
||||
Login()
|
||||
if (src.droneTransitioning==1)
|
||||
..()
|
||||
return
|
||||
|
||||
src.releaseControl(0)
|
||||
|
||||
|
||||
ex_act(severity)
|
||||
flick("flash", src.flash)
|
||||
|
||||
|
||||
@@ -102,3 +102,7 @@ HUMANS_CAN_USE_DRONES
|
||||
|
||||
# If this isn't commented out, drones can't be pulled or pushed, but drones and other non-drone mobs can walk through the same tiles. (If it is commented out, you can push and pull drones just like you can other people, but you can't walk through the same tiles as them)
|
||||
#WALKABLE_NOT_PULLABLE_DRONES
|
||||
|
||||
# This changes how plasma works to match background information (largely making it more dangerous) - see http://forums.ss13.net/index.php/topic,8569.msg79766/topicseen.html
|
||||
# Note: This isn't actually implemented.
|
||||
# PLASMA_DANGER
|
||||
|
||||
Reference in New Issue
Block a user