Minor fixes:

- after losing and restoring power air alarms had wrong icon.
- same for air vents.
- Latejoiners now get filled DNA entry in medical computer.
- Fixed rare bug with APC.
- Electrocuting while laying wires was made more consistent. Do not forget your gloves.
Borgs now can restock wires, glass and metal in recharging station.
Added logging of bagbombing.
Internal buffer in ChemMaster have volume 100 units.
Metalcrafting window improved.
Added Soviet soda vending machine to the derelict.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1705 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-06-22 15:46:53 +00:00
parent 3c0a76df30
commit d985841a76
16 changed files with 1065 additions and 995 deletions
@@ -709,7 +709,9 @@
for (var/obj in module.modules)
if(activated(obj))
if (!obj)
dat += text("<B>Resource depleted</B><BR>")
else if(activated(obj))
dat += text("[obj]: <B>Activated</B><BR>")
else
dat += text("[obj]: <A HREF=?src=\ref[src];act=\ref[obj]>Activate</A><BR>")
@@ -16,6 +16,9 @@
emag.emp_act(severity)
..()
proc/respawn_consumable(var/mob/living/silicon/robot/R)
return
/obj/item/weapon/robot_module/standard
name = "standard robot module"
/*
@@ -92,6 +95,20 @@ obj/item/weapon/robot_module/syndicate
src.emag = new /obj/item/weapon/borg/stun(src)
/obj/item/weapon/robot_module/engineering/respawn_consumable(var/mob/living/silicon/robot/R)
var/list/what = list (
/obj/item/stack/sheet/metal,
/obj/item/stack/sheet/rglass,
/obj/item/weapon/cable_coil,
)
for (var/T in what)
if (!(locate(T) in src.modules))
src.modules -= null
var/O = new T(src)
src.modules += O
O:amount = 1
/*
/obj/item/weapon/robot_module/medical/New()
..()
+1 -1
View File
@@ -327,7 +327,7 @@ mob/new_player
G.fields["p_stat"] = "Active"
G.fields["m_stat"] = "Stable"
M.fields["b_type"] = text("[]", H.b_type)
M.fields["b_dna"] = ""//H.dna.unique_enzymes
M.fields["b_dna"] = H.dna.unique_enzymes
M.fields["mi_dis"] = "None"
M.fields["mi_dis_d"] = "No minor disabilities have been declared."
M.fields["ma_dis"] = "None"
+1 -1
View File
@@ -428,7 +428,7 @@
else
if (istype(user, /mob/living/silicon))
return src.attack_hand(user)
if (wiresexposed && \
if (!opened && wiresexposed && \
(istype(W, /obj/item/device/multitool) || \
istype(W, /obj/item/weapon/wirecutters)))
return src.attack_hand(user)
+12 -1
View File
@@ -317,6 +317,10 @@
C.updateicon()
C.update_network()
use(1)
if (C.shock(user, 50))
if (prob(50))
new/obj/item/weapon/cable_coil(C.loc, C.d1 ? 2 : 1, C.color)
del(C)
//src.laying = 1
//last = C
@@ -382,7 +386,10 @@
NC.updateicon()
NC.update_network()
use(1)
C.shock(user, 25)
if (NC.shock(user, 50))
if (prob(50))
new/obj/item/weapon/cable_coil(NC.loc, NC.d1 ? 2 : 1, NC.color)
del(NC)
return
else if(C.d1 == 0) // exisiting cable doesn't point at our position, so see if it's a stub
@@ -427,6 +434,10 @@
NC.update_network()
use(1)
if (NC.shock(user, 50))
if (prob(50))
new/obj/item/weapon/cable_coil(NC.loc, NC.d1 ? 2 : 1, NC.color)
del(NC)
return
@@ -219,6 +219,9 @@ var/global/list/uneatable = list(
consume(var/atom/A)
if (istype(A,/obj/item/weapon/storage/backpack/holding))
var/log_str = "\The [src] was exploded in [get_area(src)] due to consumption of [A], last touched by: [A.fingerprintslast]"
message_admins(log_str)
log_game(log_str)
del(A)
explosion(src.loc,10,15,20,40)
if(src) del(src)