From 312ece670dc2e4138455ea17a719f87498c67477 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 30 May 2013 19:26:53 +0300 Subject: [PATCH 1/5] Meteor shower fix. Meteor shower actually processes tick() between starting and ending, thus spawning meteors as it is supposed to. --- code/modules/events/meteors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 50f05f7a1120982e4209e55c1069334b52895ff4 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 30 May 2013 19:28:34 +0300 Subject: [PATCH 2/5] Pill bottles can hold paper. For prescriptions and such. --- code/game/objects/items/weapons/storage/firstaid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f35290bf25cdee62b2cf695c7943d1eb24d3fa05 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 30 May 2013 19:30:36 +0300 Subject: [PATCH 3/5] Engineering tape can be placed on doors. --- code/WorkInProgress/Ported/policetape.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 3409e1f05db8fe93b7d54be6bab8ec0fde5bf67b Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 30 May 2013 19:35:03 +0300 Subject: [PATCH 4/5] Toolbelts can hold engineering tape. --- code/game/objects/items/weapons/storage/belt.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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() From b0251e0afa64a72676b60cfa2fb7362f661cfc7f Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 30 May 2013 19:40:19 +0300 Subject: [PATCH 5/5] Update changelog.html --- html/changelog.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index faf07592ed4..bb6795c889d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -67,6 +67,16 @@ should be listed in the changelog upon commit though. Thanks. --> +
+

30.05.2013

+

Segrain updated:

+
    +
  • Meteor showers actually spawn meteors now.
  • +
  • Engineering tape fits into toolbelt and can be placed on doors.
  • +
  • Pill bottles can hold paper.
  • +
+
+

28th May 2013

Erthilo updated: