diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index effb2ca79a8..417224bfa59 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -611,6 +611,17 @@ containertype = /obj/structure/closet/crate/secure/gear containername = "Security Barriers crate" +/datum/supply_packs/securitybarriers + name = "Shield Generators" + contains = list(/obj/machinery/shieldwallgen, + /obj/machinery/shieldwallgen, + /obj/machinery/shieldwallgen, + /obj/machinery/shieldwallgen) + cost = 20 + containertype = /obj/structure/closet/crate/secure + containername = "Shield Generators crate" + access = access_teleporter + /datum/supply_packs/randomised var/num_contained = 3 //number of items picked to be contained in a randomised crate contains = list(/obj/item/clothing/head/collectable/chef, diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index e939f34653b..3f3d7a7504a 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -55,7 +55,7 @@ /obj/machinery/power/emitter/attack_hand(mob/user as mob) src.add_fingerprint(user) if(state == 2) - if(!powernet && !connect_to_network()) + if(!powernet) user << "The emitter isn't connected to a wire." return 1 if(!src.locked) diff --git a/html/changelog.html b/html/changelog.html index 5b7270bab9a..66bd339e768 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,14 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

30 December 2012

+

Giacom updated:

+ +

26 December 2012

Ikarrus updated: