From 316aa215be26d92f7abdc8e99a412d98a7101ed3 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 31 Dec 2013 00:32:24 +1030 Subject: [PATCH 1/5] Disables meteor mode. --- baystation12.dme | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index b50088fab11..961ccf32a3c 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -221,7 +221,6 @@ #include "code\game\gamemodes\heist\heist.dm" #include "code\game\gamemodes\malfunction\Malf_Modules.dm" #include "code\game\gamemodes\malfunction\malfunction.dm" -#include "code\game\gamemodes\meteor\meteor.dm" #include "code\game\gamemodes\meteor\meteors.dm" #include "code\game\gamemodes\nuclear\nuclear.dm" #include "code\game\gamemodes\nuclear\nuclearbomb.dm" @@ -1237,12 +1236,12 @@ #include "code\modules\surgery\eye.dm" #include "code\modules\surgery\face.dm" #include "code\modules\surgery\generic.dm" +#include "code\modules\surgery\headreattach.dm" #include "code\modules\surgery\implant.dm" #include "code\modules\surgery\other.dm" #include "code\modules\surgery\ribcage.dm" #include "code\modules\surgery\robolimbs.dm" #include "code\modules\surgery\surgery.dm" -#include "code\modules\surgery\headreattach.dm" #include "code\modules\telesci\bscrystal.dm" #include "code\modules\telesci\gps.dm" #include "code\modules\telesci\telepad.dm" From 19c963ac733ddf36415dfcf77b1a0ee68104efba Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 31 Dec 2013 04:24:53 +1030 Subject: [PATCH 2/5] Revised commit due to Mloc's suggestion. --- baystation12.dme | 1 + code/game/gamemodes/meteor/meteor.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/baystation12.dme b/baystation12.dme index 961ccf32a3c..05bf9e386e9 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -221,6 +221,7 @@ #include "code\game\gamemodes\heist\heist.dm" #include "code\game\gamemodes\malfunction\Malf_Modules.dm" #include "code\game\gamemodes\malfunction\malfunction.dm" +#include "code\game\gamemodes\meteor\meteor.dm" #include "code\game\gamemodes\meteor\meteors.dm" #include "code\game\gamemodes\nuclear\nuclear.dm" #include "code\game\gamemodes\nuclear\nuclearbomb.dm" diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index deb28d76893..712512bd479 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -6,6 +6,7 @@ var/const/meteordelay = 2000 var/nometeors = 1 required_players = 0 + votable = 0 uplink_welcome = "EVIL METEOR Uplink Console:" uplink_uses = 10 From 25f7db1949a6cbfcf8071236f0591b1095b095e6 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 31 Dec 2013 11:32:36 +1030 Subject: [PATCH 3/5] Fix for unremovable dirty tiles. --- code/game/objects/effects/decals/Cleanable/misc.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 0b257a3e111..d94d4670bea 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -40,6 +40,14 @@ icon = 'icons/effects/effects.dmi' icon_state = "dirt" +/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/crowbar)) + var/turf/T = get_turf(src) + if(T) + T.attackby(W,user) + return + ..() + /obj/effect/decal/cleanable/flour name = "flour" desc = "It's still good. Four second rule!" From 441b0151863cb3b424356aa7712f3faf0c675bc9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 31 Dec 2013 11:34:35 +1030 Subject: [PATCH 4/5] Fix for absurd dirt levels. --- code/game/turfs/simulated.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 241c84d3f97..ed415411a52 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -23,12 +23,12 @@ if(M.lying) return dirt++ var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, src) - if (dirt >= 30) + if (dirt >= 50) if (!dirtoverlay) dirtoverlay = new/obj/effect/decal/cleanable/dirt(src) dirtoverlay.alpha = 15 - else if (dirt > 30) - dirtoverlay.alpha = min(dirtoverlay.alpha+20, 255) + else if (dirt > 50) + dirtoverlay.alpha = min(dirtoverlay.alpha+5, 255) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M From 9d4d14f1078fe97f6174e142b5dda69dacbb5f3f Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 31 Dec 2013 11:37:21 +1030 Subject: [PATCH 5/5] Fix for low oxy tank at ninja spawn. --- code/game/gamemodes/events/space_ninja.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index c3b77d5f875..4d0df9c3f7f 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -547,7 +547,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt) equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_r_store) equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_l_store) - equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store) + equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(src), slot_s_store) return 1 //=======//HELPER PROCS//=======//