cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected

Browse Source 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael Aislinn
2013-10-29 05:10:17 +10:00
parent 524e3b3d2b
commit a4e5bad409
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/Cael_Aislinn/Rust/fusion_reactions.dm
View File

@@ -145,14 +145,14 @@ datum/fusion_reaction/pergium_tritium
energy_production = 0 energy_production = 0
radiation = 5 radiation = 5
datum/fusion_reaction/pergium_deuterium datum/fusion_reaction/pergium_obdurium
primary_reactant = "Pergium" primary_reactant = "Pergium"
secondary_reactant = "Obdurium" secondary_reactant = "Obdurium"
energy_consumption = 5 energy_consumption = 5
energy_production = 0 energy_production = 0
radiation = 5 radiation = 5
datum/fusion_reaction/pergium_tritium datum/fusion_reaction/pergium_solonium
primary_reactant = "Pergium" primary_reactant = "Pergium"
secondary_reactant = "Solonium" secondary_reactant = "Solonium"
energy_consumption = 5 energy_consumption = 5

2
code/game/machinery/computer/card.dm
View File

@@ -152,7 +152,7 @@
carddesc += "<input type='hidden' name='src' value='\ref[src]'>" carddesc += "<input type='hidden' name='src' value='\ref[src]'>"
carddesc += "<input type='hidden' name='choice' value='account'>" carddesc += "<input type='hidden' name='choice' value='account'>"
carddesc += "<b>Stored account number:</b> <input type='text' id='accountfield' name='account' value='[modify.associated_account_number]' style='width:250px; background-color:white;' onchange='markAccountRed()'>" carddesc += "<b>Stored account number:</b> <input type='text' id='accountfield' name='account' value='[modify.associated_account_number]' style='width:250px; background-color:white;' onchange='markAccountRed()'>"
carddesc += "<input type='submit' value='Rename' onclick='markAccountGreen()'>" carddesc += "<input type='submit' value='Modify' onclick='markAccountGreen()'>"
carddesc += "</form>" carddesc += "</form>"
carddesc += "<b>Assignment:</b> " carddesc += "<b>Assignment:</b> "

10
code/game/objects/structures/transit_tubes.dm
View File

@@ -99,6 +99,16 @@ obj/structure/ex_act(severity)
/obj/structure/transit_tube/Bumped(mob/AM as mob|obj)
var/obj/structure/transit_tube/T = locate() in AM.loc
if(T)
AM << "<span class='warning'>The tube's support pylons block your way.</span>"
return ..()
else
AM.loc = src.loc
AM << "<span class='info'>You slip under the tube.</span>"
/obj/structure/transit_tube/station/New(loc) /obj/structure/transit_tube/station/New(loc)
..(loc) ..(loc)

4
code/modules/recycling/conveyor2.dm
View File

@@ -211,6 +211,10 @@
// attack with hand, switch position // attack with hand, switch position
/obj/machinery/conveyor_switch/attack_hand(mob/user) /obj/machinery/conveyor_switch/attack_hand(mob/user)
if(!allowed(user))
user << "<span class='warning'>Access denied.</span>"
return
if(position == 0) if(position == 0)
if(last_pos < 0) if(last_pos < 0)
position = 1 position = 1