diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 43a41c5a937..f5d17f81378 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -95,7 +95,7 @@ //is_blocked_turf(var/turf/T) usr << "\blue You finish placing the [src]." //Git Test -/obj/item/taperoll/police/afterattack(var/atom/A, mob/user as mob) +/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob) if (istype(A, /obj/machinery/door/airlock)) var/turf/T = get_turf(A) var/obj/item/tape/P = new tape_type(T.x,T.y,T.z) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5fdfc357490..d43f7657f2c 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -18,14 +18,6 @@ use_power = 0 var/release_log = "" -/obj/machinery/portable_atmospherics/initialize() - . = ..() - spawn() - var/obj/machinery/atmospherics/portables_connector/connector = locate() in loc - if(connector) - connected_port = connector - update_icon() - /obj/machinery/portable_atmospherics/canister/sleeping_agent name = "Canister: \[N2O\]" icon_state = "redws" diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 939e1c94f32..d29b1f065c0 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -129,5 +129,5 @@ if (!target) src.target = loc -/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - return \ No newline at end of file +/obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + return diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index f929cc0d5eb..dbfd5b62e6a 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -19,6 +19,14 @@ return 1 + initialize() + . = ..() + spawn() + var/obj/machinery/atmospherics/portables_connector/port = locate() in loc + if(port) + connect(port) + update_icon() + process() if(!connected_port) //only react when pipe_network will ont it do it for you //Allow for reactions @@ -135,4 +143,4 @@ user << "\blue Tank is empty!" return - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index fcb00122873..9cc03ebce3b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -51,7 +51,8 @@ "/obj/item/device/flashlight", "/obj/item/weapon/cable_coil", "/obj/item/device/t_scanner", - "/obj/item/device/analyzer") + "/obj/item/device/analyzer", + "/obj/item/taperoll/engineering") /obj/item/weapon/storage/belt/utility/full/New() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 1369bb15759..8ea7ff3903d 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -103,7 +103,7 @@ icon = 'icons/obj/chemical.dmi' item_state = "contsolid" w_class = 2.0 - can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice") + can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice","/obj/item/weapon/paper") allow_quick_gather = 1 use_to_pickup = 1 storage_slots = 14 diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index b917c93752b..0f74d65b7d9 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -21,7 +21,7 @@ // /datum/event/meteor_shower - startWhen = 6 + startWhen = 5 endWhen = 7 var/next_meteor = 6 var/waves = 1 diff --git a/html/changelog.html b/html/changelog.html index faf07592ed4..b0b1f002a55 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -59,6 +59,15 @@ should be listed in the changelog upon commit though. Thanks. -->
+
+

31.05.2013

+

Segrain updated:

+ +
+

30th May 2013

proliberate updated:

@@ -67,6 +76,16 @@ should be listed in the changelog upon commit though. Thanks. -->
+
+

30.05.2013

+

Segrain updated:

+ +
+

28th May 2013

Erthilo updated: