cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Browse Source
This commit is contained in:
Ren Erthilo
2012-04-29 04:11:57 +01:00
parent 4df9897ce0 bb2478bc3c
commit 105160fb72
14 changed files with 8792 additions and 8821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cell.dm
+4
View File
@@ -109,6 +109,10 @@
if(S.reagents.has_reagent("plasma", 5))
log_attack("<font color='red'>[user.name] ([user.ckey]) injected a power cell with plasma.</font>")
log_admin("ATTACK: [user] ([user.ckey]) injected a power cell with plasma.")
message_admins("ATTACK: [user] ([user.ckey]) injected a power cell with plasma.")
rigged = 1
S.reagents.clear_reagents()
code/modules/power/lighting.dm
+5 -1
View File
@@ -44,7 +44,7 @@
brightness = 3
desc = "A small lighting fixture."
light_type = /obj/item/weapon/light/bulb
/obj/machinery/light/small/spot
brightness = 5
@@ -532,6 +532,10 @@
if(S.reagents.has_reagent("plasma", 5))
log_attack("<font color='red'>[user.name] ([user.ckey]) injected a light with plasma.</font>")
log_admin("ATTACK: [user] ([user.ckey]) injected a light with plasma.")
message_admins("ATTACK: [user] ([user.ckey]) injected a light with plasma.")
rigged = 1
S.reagents.clear_reagents()