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

Suicide bugfix, uplink bugfix, Made the electrical storm disrupt radio again, buugfix for the new door stuff, retoring UI+UE recovers identity.

Browse Source
This commit is contained in:
SkyMarshal
2012-01-28 15:47:26 -07:00
parent 2e531323d4
commit 795d07fc6a
6 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Ported/Abi79/uplinks.dm
View File

@@ -46,9 +46,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
for(var/D in ItemList)
var/list/O = stringsplit(D, ":")
if(O.len != 3) //If it is not an actual item, make a break in the menu.
if(O.len == 1) //If there is one item, it's probably a title
if(category_items < 1) //If there were no itens in the last category...
src.menu_message += "<i>We apologize, as you could not afford anything from this category.</i><br>"
if(O.len == 1) //If there is one item, it's probably a title
src.menu_message += "<b>[O[1]]</b><br>"
category_items = 0
else //Else, it's a white space.

33
code/game/dna.dm
View File

@@ -3,6 +3,7 @@
var/unique_enzymes = null
var/struc_enzymes = null
var/uni_identity = null
var/original_name = "Unknown"
/datum/dna/proc/check_integrity()
//Lazy.
@@ -66,6 +67,7 @@
struc_enzymes = mutstring
unique_enzymes = md5(character.real_name)
original_name = character.real_name
reg_dna[unique_enzymes] = character.real_name
/////////////////////////// DNA DATUM
@@ -687,6 +689,7 @@
src.updateUsrDialog()
/obj/machinery/scan_consolenew/process() //not really used right now
processing_objects.Remove(src) //Lets not have it waste CPU
if(stat & (NOPOWER|BROKEN))
return
if (!( src.status )) //remove this
@@ -1028,6 +1031,9 @@
src.buffer1 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer1owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer1owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer1owner = src.connected.occupant.real_name
src.buffer1label = "Unique Identifier"
@@ -1037,6 +1043,9 @@
src.buffer1 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer1owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer1owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer1owner = src.connected.occupant.real_name
src.buffer1label = "Unique Identifier & Unique Enzymes"
@@ -1047,6 +1056,9 @@
src.buffer2 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer2owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer2owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer2owner = src.connected.occupant.real_name
src.buffer2label = "Unique Identifier & Unique Enzymes"
@@ -1057,6 +1069,9 @@
src.buffer3 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer3owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer3owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer3owner = src.connected.occupant.real_name
src.buffer3label = "Unique Identifier & Unique Enzymes"
@@ -1068,6 +1083,9 @@
src.buffer2 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer2owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer2owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer2owner = src.connected.occupant.real_name
src.buffer2label = "Unique Identifier"
@@ -1078,6 +1096,9 @@
src.buffer3 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer3owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer3owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer3owner = src.connected.occupant.real_name
src.buffer3label = "Unique Identifier"
@@ -1088,6 +1109,9 @@
src.buffer1 = src.connected.occupant.dna.struc_enzymes
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer1owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer1owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer1owner = src.connected.occupant.real_name
src.buffer1label = "Structural Enzymes"
@@ -1098,6 +1122,9 @@
src.buffer2 = src.connected.occupant.dna.struc_enzymes
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer2owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer2owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer2owner = src.connected.occupant.real_name
src.buffer2label = "Structural Enzymes"
@@ -1108,6 +1135,9 @@
src.buffer3 = src.connected.occupant.dna.struc_enzymes
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer3owner = src.connected.occupant.name
else
if(src.connected.occupant.real_name == "Unknown" && src.connected.occupant.dna.original_name != "Unknown")
src.buffer3owner = src.connected.occupant.dna.original_name //Good god, is that unweildy
else
src.buffer3owner = src.connected.occupant.real_name
src.buffer3label = "Structural Enzymes"
@@ -1147,6 +1177,7 @@
if (src.buffer1iue)
src.connected.occupant.real_name = src.buffer1owner
src.connected.occupant.name = src.buffer1owner
src.connected.occupant.dna.original_name = src.buffer1owner
src.connected.occupant.dna.uni_identity = src.buffer1
updateappearance(src.connected.occupant,src.connected.occupant.dna.uni_identity)
else if (src.buffer1type == "se")
@@ -1162,6 +1193,7 @@
if (src.buffer2iue)
src.connected.occupant.real_name = src.buffer2owner
src.connected.occupant.name = src.buffer2owner
src.connected.occupant.dna.original_name = src.buffer2owner
src.connected.occupant.dna.uni_identity = src.buffer2
updateappearance(src.connected.occupant,src.connected.occupant.dna.uni_identity)
else if (src.buffer2type == "se")
@@ -1177,6 +1209,7 @@
if (src.buffer3iue)
src.connected.occupant.real_name = src.buffer3owner
src.connected.occupant.name = src.buffer3owner
src.connected.occupant.dna.original_name = src.buffer3owner
src.connected.occupant.dna.uni_identity = src.buffer3
updateappearance(src.connected.occupant,src.connected.occupant.dna.uni_identity)
else if (src.buffer3type == "se")

9
code/game/events/Events/ElectricalStorm.dm
View File

@@ -3,6 +3,7 @@
list/obj/machinery/light/Lights = list( )
list/obj/machinery/light/APCs = list( )
list/obj/machinery/light/Doors = list( )
list/obj/machinery/light/Comms = list( )
Announce()
command_alert("The station is flying through an electrical storm. Radio communications may be disrupted", "Anomaly Alert")
@@ -19,6 +20,11 @@
if(Door.z == 1)
Doors += Door
for(var/obj/machinery/telecomms/processor/T in world)
if(prob(90) && !(T.stat & (BROKEN|NOPOWER)))
T.stat |= BROKEN
Comms |= T
Tick()
for(var/x = 0; x < 3; x++)
if (prob(30))
@@ -31,6 +37,9 @@
Die()
command_alert("The station has cleared the electrical storm. Radio communications restored", "Anomaly Alert")
for(var/obj/machinery/telecomms/processor/T in Comms)
T.stat &= ~BROKEN
Comms = list()
proc
BlowLight() //Blow out a light fixture

9
code/game/machinery/doors/door.dm
View File

@@ -293,18 +293,21 @@
return
src.operating = 1
var/X = src:x
var/Y = src:y
var/Z = src:z
var/held = 1
if(src.holdopen)
while(held == 1)
sleep(held? 10:40)
held = 0
var/list/objects = locate() in get_turf(src)
var/list/objects = locate(X,Y,Z)
for(var/obj/T in objects)
if(T != src)
if(!istype(T,/obj/machinery/door))
held = 1
for(var/mob/T in objects)
held = 1
sleep(10)
animate("closing")
src.density = 1
spawn(4)

1
code/game/objects/items/weapons/dna_injector.dm
View File

@@ -31,6 +31,7 @@
updateappearance(M, M.dna.uni_identity)
M.real_name = ue
M.name = ue
M.dna.original_name = ue
uses--
else //unique enzymes? no
M.dna.uni_identity = dna

3
code/game/verbs/suicide.dm
View File

@@ -11,8 +11,9 @@
src << "You can't commit suicide before the game starts!"
return
if (!src.mind.special_role == "Syndicate")
if (mind.special_role != "Syndicate")
src << "No."
return
if (suiciding)
src << "You're already committing suicide! Be patient!"