From 316aa215be26d92f7abdc8e99a412d98a7101ed3 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 31 Dec 2013 00:32:24 +1030 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 04/16] 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 05/16] 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//=======// From 645710cb0b8738a7ad606e2df45efa077a4801f9 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Mon, 30 Dec 2013 21:59:20 -0600 Subject: [PATCH 06/16] Bugfix: Actually implement cleanbot targeting. Cleanbots won't attempt to clean up the same mess. Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds. It was creating a blank list and then checking that list to see if anything else had that mess targeted. Removed the blank list check and added an actual check. --- code/game/machinery/bots/cleanbot.dm | 18 ++++++++++++------ code/game/objects/effects/decals/cleanable.dm | 3 ++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index aa274e505eb..04b87c206ea 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -66,6 +66,8 @@ /obj/machinery/bot/cleanbot/turn_off() ..() + if(!isnull(src.target)) + target.targeted_by = null src.target = null src.oldtarget = null src.oldloc = null @@ -165,7 +167,6 @@ text("[src.oddbutton ? "Yes" : "No" return if(src.cleaning) return - var/list/cleanbottargets = list() if(!src.screwloose && !src.oddbutton && prob(5)) visible_message("[src] makes an excited beeping booping sound!") @@ -194,9 +195,10 @@ text("[src.oddbutton ? "Yes" : "No" if(!src.target || src.target == null) for (var/obj/effect/decal/cleanable/D in view(7,src)) for(var/T in src.target_types) - if(!(D in cleanbottargets) && (D.type == T || D.parent_type == T) && D != src.oldtarget) - src.oldtarget = D - src.target = D + if(isnull(D.targeted_by) && (D.type == T || D.parent_type == T) && D != src.oldtarget) // If the mess isn't targeted + src.oldtarget = D // or if it is but the bot is gone. + src.target = D // and it's stuff we clean? Clean it. + D.targeted_by = src // Claim the mess we are targeting. return if(!src.target || src.target == null) @@ -238,6 +240,7 @@ text("[src.oddbutton ? "Yes" : "No" if(src.path.len == 0) src.oldtarget = src.target src.target = null + target.targeted_by = null return if(src.path.len > 0 && src.target && (src.target != null)) step_to(src, src.path[1]) @@ -312,7 +315,10 @@ text("[src.oddbutton ? "Yes" : "No" src.icon_state = "cleanbot-c" visible_message("\red [src] begins to clean up the [target]") src.cleaning = 1 - spawn(50) + var/cleantime = 50 + if(istype(target,/obj/effect/decal/cleanable/dirt)) // Clean Dirt much faster + cleantime = 10 + spawn(cleantime) src.cleaning = 0 del(target) src.icon_state = "cleanbot[src.on]" @@ -355,4 +361,4 @@ text("[src.oddbutton ? "Yes" : "No" return if (!in_range(src, usr) && src.loc != usr) return - src.created_name = t \ No newline at end of file + src.created_name = t diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index d1227d3aa38..63956f5e89a 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -1,7 +1,8 @@ /obj/effect/decal/cleanable var/list/random_icon_states = list() + var/targeted_by = null // Used so cleanbots can't claim a mess. /obj/effect/decal/cleanable/New() if (random_icon_states && length(src.random_icon_states) > 0) src.icon_state = pick(src.random_icon_states) - ..() \ No newline at end of file + ..() From 36f81bd9b07bffe71a92ffd83481f9bae8b1d883 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Tue, 31 Dec 2013 18:02:48 -0600 Subject: [PATCH 07/16] DNA2 clone fix. No longer albino with blue beards. Looks like a copy paste problem where the eye blocks were being set to facial blocks and the math needed for s_tone wasn't being done. Todo: Fix clones not having unique_enzymes, /list being displayed in cloning pod, etc. --- code/game/dna/dna2.dm | 21 +++++++++++++-------- code/game/dna/dna2_helpers.dm | 5 +++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 9102ee87801..bed41f2cc71 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -110,11 +110,11 @@ var/global/list/assigned_blocks[STRUCDNASIZE] SetUIValueRange(DNA_UI_BEARD_G, character.g_facial, 255, 1) SetUIValueRange(DNA_UI_BEARD_B, character.b_facial, 255, 1) - SetUIValueRange(DNA_UI_BEARD_R, character.r_eyes, 255, 1) - SetUIValueRange(DNA_UI_BEARD_G, character.g_eyes, 255, 1) - SetUIValueRange(DNA_UI_BEARD_B, character.b_eyes, 255, 1) + SetUIValueRange(DNA_UI_EYES_R, character.r_eyes, 255, 1) + SetUIValueRange(DNA_UI_EYES_G, character.g_eyes, 255, 1) + SetUIValueRange(DNA_UI_EYES_B, character.b_eyes, 255, 1) - SetUIValueRange(DNA_UI_SKIN_TONE, character.s_tone, 220, 1) + SetUIValueRange(DNA_UI_SKIN_TONE, -character.s_tone+35, 220, 1) // WARNING: MATH. Blame the person that setup line 944 in modules/client/preferences.dm SetUIState(DNA_UI_GENDER, character.gender!=MALE, 1) @@ -140,18 +140,22 @@ var/global/list/assigned_blocks[STRUCDNASIZE] // Set a DNA UI block's value, given a value and a max possible value. // Used in hair and facial styles (value being the index and maxvalue being the len of the hairstyle list) -/datum/dna/proc/SetUIValueRange(var/block,var/value,var/maxvalue) +/datum/dna/proc/SetUIValueRange(var/block,var/value,var/maxvalue,var/minvalue) if (block<=0) return + if(value < minvalue) + value=minvalue + else if(value > maxvalue) + value=maxvalue ASSERT(maxvalue<=4095) - var/range = round(4095 / maxvalue) + var/range = (4095 / maxvalue) if(value) - SetUIValue(block,value * range - rand(1,range-1)) + SetUIValue(block,round(value * range)) // Getter version of above. /datum/dna/proc/GetUIValueRange(var/block,var/maxvalue) if (block<=0) return 0 var/value = GetUIValue(block) - return round(1 +(value / 4096)*maxvalue) + return round(1+(value / 4096)*maxvalue) // Is the UI gene "on" or "off"? // For UI, this is simply a check of if the value is > 2050. @@ -317,6 +321,7 @@ var/global/list/assigned_blocks[STRUCDNASIZE] unique_enzymes = md5(character.real_name) else if(length(uni_identity) != 3*DNA_UI_LENGTH) + world << "OH FUCK WE SET THE UNI_IDENTIY STRING" uni_identity = "00600200A00E0110148FC01300B0095BD7FD3F4" if(length(struc_enzymes)!= 3*STRUCDNASIZE) struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6" diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 08d07ab2e1f..44ab4301cf7 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -143,7 +143,8 @@ H.g_eyes = dna.GetUIValueRange(DNA_UI_EYES_G, 255) H.b_eyes = dna.GetUIValueRange(DNA_UI_EYES_B, 255) - H.s_tone = dna.GetUIValueRange(DNA_UI_SKIN_TONE, 220) + var/new_s_tone = dna.GetUIValueRange(DNA_UI_SKIN_TONE, 220) + H.s_tone = 35 - max(min( round(new_s_tone), 220),1) //Warning MATH. Blame the person that wrote modules/client/preferences.dm, line 994 if (dna.GetUIState(DNA_UI_GENDER)) H.gender = FEMALE @@ -475,4 +476,4 @@ if(M) M.update_icon = 1 //queue a full icon update at next life() call return null -/////////////////////////// DNA MISC-PROCS \ No newline at end of file +/////////////////////////// DNA MISC-PROCS From 3448b24dad73c59da8b2d44bfde76e0ae175f023 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Tue, 31 Dec 2013 18:06:39 -0600 Subject: [PATCH 08/16] Removed debug messages. --- code/game/dna/dna2.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index bed41f2cc71..60da3893fa6 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -321,7 +321,6 @@ var/global/list/assigned_blocks[STRUCDNASIZE] unique_enzymes = md5(character.real_name) else if(length(uni_identity) != 3*DNA_UI_LENGTH) - world << "OH FUCK WE SET THE UNI_IDENTIY STRING" uni_identity = "00600200A00E0110148FC01300B0095BD7FD3F4" if(length(struc_enzymes)!= 3*STRUCDNASIZE) struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6" From 5085ee256182207db412191ee4216938a6375790 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Wed, 1 Jan 2014 00:02:17 -0800 Subject: [PATCH 09/16] Emergency fix for mods not loading. --- code/world.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/world.dm b/code/world.dm index 95453243430..3d1ad20db98 100644 --- a/code/world.dm +++ b/code/world.dm @@ -29,6 +29,9 @@ config.server_name += " #[(world.port % 1000) / 100]" callHook("startup") + //Emergency Fix + load_mods() + //end-emergency fix src.update_status() From c6c09954aa3203f49102419d82d799e85b083ca9 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Wed, 1 Jan 2014 02:55:08 -0600 Subject: [PATCH 10/16] Cleanbot runtime derp. Set something to null then change a variable on it? Sure that won't runtime. --- code/game/machinery/bots/cleanbot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 04b87c206ea..7b5e18413f7 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -239,8 +239,8 @@ text("[src.oddbutton ? "Yes" : "No" if (!path) path = list() if(src.path.len == 0) src.oldtarget = src.target - src.target = null target.targeted_by = null + src.target = null return if(src.path.len > 0 && src.target && (src.target != null)) step_to(src, src.path[1]) From b6af4a1b4eab15edf571560c58d8d921bb88897e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 1 Jan 2014 21:26:19 +1030 Subject: [PATCH 11/16] Removes mime and HONK carts from protolathe. --- code/modules/research/designs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index b9d25c2677b..e73434a2f39 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1765,6 +1765,8 @@ datum/design/cart_janitor build_type = PROTOLATHE materials = list("$metal" = 50, "$glass" = 50) build_path = "/obj/item/weapon/cartridge/janitor" + +/* datum/design/cart_clown name = "Honkworks 5.0 Cartridge" desc = "A data cartridge for portable microcomputers." @@ -1781,6 +1783,8 @@ datum/design/cart_mime build_type = PROTOLATHE materials = list("$metal" = 50, "$glass" = 50) build_path = "/obj/item/weapon/cartridge/mime" +*/ + datum/design/cart_toxins name = "Signal Ace 2 Cartridge" desc = "A data cartridge for portable microcomputers." From f638f1db9625dcc6427fc19caf9281276c06c887 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 1 Jan 2014 21:33:23 +1030 Subject: [PATCH 12/16] Prevented the ability to open locked crates with random items. --- code/modules/mining/abandonedcrates.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index d55c7e329ac..c52589f9e5d 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -130,5 +130,4 @@ user << "* Last access attempt lower than expected code." else user << "* Last access attempt higher than expected code." - else ..() else ..() From 1cddbeb18055956d594dbe8bd6f60b7a78f3e7d3 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 1 Jan 2014 22:10:25 +1030 Subject: [PATCH 13/16] Fix for ninja being unable to wear full-sized oxytanks. --- code/modules/clothing/spacesuits/ninja.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm index 9e071cae010..c146bb21a50 100644 --- a/code/modules/clothing/spacesuits/ninja.dm +++ b/code/modules/clothing/spacesuits/ninja.dm @@ -13,7 +13,7 @@ desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins." icon_state = "s-ninja" item_state = "s-ninja_suit" - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/cell) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/weapon/cell) slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0.2 From 37d96ebc80c876721f9dbc0f2f335ca68ecb7278 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 2 Jan 2014 00:42:11 +1030 Subject: [PATCH 14/16] Nerfs abandoned crates to be less fucking moronic. --- code/modules/mining/abandonedcrates.dm | 62 +++++++++----------------- code/modules/mining/mine_turfs.dm | 2 +- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index c52589f9e5d..95df457c853 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -24,65 +24,46 @@ if(2) new/obj/item/weapon/pickaxe/drill(src) new/obj/item/device/taperecorder(src) - new/obj/item/clothing/suit/space/rig(src) - new/obj/item/clothing/head/helmet/space/rig(src) + new/obj/item/clothing/suit/space(src) + new/obj/item/clothing/head/helmet/space(src) if(3) - for(var/i = 0, i < 12, i++) - new/obj/item/weapon/coin/diamond(src) + return if(4) - new/obj/item/weapon/bananapeel(src) - if(5) - for(var/i = 0, i < 6, i++) - new/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake(src) - new/obj/item/weapon/lighter/zippo(src) - if(7) new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src) - if(9 to 10) + if(5 to 6) for(var/i = 0, i < 10, i++) new/obj/item/weapon/ore/diamond(src) - if(11) + if(7) return - if(12) - new/obj/item/seeds/deathberryseed(src) - new/obj/item/seeds/deathnettleseed(src) - if(13) - new/obj/machinery/hydroponics(src) - if(14) - new/obj/item/seeds/cashseed(src) - if(15) + if(8) + return + if(9) + for(var/i = 0, i < 3, i++) + new/obj/machinery/hydroponics(src) + if(10) for(var/i = 0, i < 3, i++) new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src) - if(16 to 17) + if(11 to 12) for(var/i = 0, i < 9, i++) new/obj/item/bluespace_crystal(src) - if(19) - for(var/i = 0, i < 4, i++) - new/obj/item/weapon/melee/classic_baton(src) - if(20) - new/obj/item/weapon/storage/lockbox/clusterbang(src) - if(21) - new/obj/item/weapon/aiModule/robocop(src) - if(22) + if(13) + new/obj/item/weapon/melee/classic_baton(src) + if(14) + return + if(15) new/obj/item/clothing/under/chameleon(src) for(var/i = 0, i < 7, i++) new/obj/item/clothing/tie/horrible(src) - if(23) + if(16) new/obj/item/clothing/under/shorts(src) new/obj/item/clothing/under/shorts/red(src) new/obj/item/clothing/under/shorts/blue(src) //Dummy crates start here. - if(24 to 29) - return - if(8) - return - if(6) - return - if(18) + if(17 to 29) return //Dummy crates end here. if(30) - for(var/i = 0, i < 4, i++) - new/obj/item/weapon/melee/baton(src) + new/obj/item/weapon/melee/baton(src) /obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob) if(locked) @@ -102,7 +83,7 @@ if (attempts == 0) user << "The crate's anti-tamper system activates!" var/turf/T = get_turf(src.loc) - explosion(T, 0, 1, 2, 1) + explosion(T, 0, 0, 0, 1) del(src) return else @@ -130,4 +111,5 @@ user << "* Last access attempt lower than expected code." else user << "* Last access attempt higher than expected code." + else ..() else ..() diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 90b2cbf0e3f..6a17f693174 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -487,7 +487,7 @@ commented out in r5061, I left it because of the shroom thingies var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid) N.fullUpdateMineralOverlays() - var/crate = rand(1,30) + var/crate = rand(1,500) switch(crate) if(1) visible_message("After digging, you find an old dusty crate buried within!") From 3f4646ed58cacb9ee08adf0a10409766aee64479 Mon Sep 17 00:00:00 2001 From: Kilakk Date: Wed, 1 Jan 2014 13:28:52 -0500 Subject: [PATCH 15/16] Fixed centcomm status reports listing vox raiders * It would say something like "Kikichata, the MODE" * Which is hilarious, but still --- code/game/gamemodes/game_mode.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 39be77978ee..26497410fa8 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -213,7 +213,7 @@ Implants; for(var/mob/living/carbon/human/man in player_list) if(man.client && man.mind) // NT relation option var/special_role = man.mind.special_role - if (special_role == "Wizard" || special_role == "Ninja" || special_role == "Syndicate") + if (special_role == "Wizard" || special_role == "Ninja" || special_role == "Syndicate" || special_role == "Vox Raider") continue //NT intelligence ruled out possiblity that those are too classy to pretend to be a crew. if(man.client.prefs.nanotrasen_relation == "Opposed" && prob(50) || \ man.client.prefs.nanotrasen_relation == "Skeptical" && prob(20)) From df5fd9555ca61c26710e6f5406969a3a06746bbe Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Wed, 1 Jan 2014 19:10:55 +0000 Subject: [PATCH 16/16] Fix for the roundstart hook "runtime". Signed-off-by: Mloc-Argent --- baystation12.dme | 1 + code/controllers/hooks-defs.dm | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 code/controllers/hooks-defs.dm diff --git a/baystation12.dme b/baystation12.dme index ce8c26ee094..773f55ba42b 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -78,6 +78,7 @@ #include "code\controllers\autotransfer.dm" #include "code\controllers\configuration.dm" #include "code\controllers\failsafe.dm" +#include "code\controllers\hooks-defs.dm" #include "code\controllers\hooks.dm" #include "code\controllers\lighting_controller.dm" #include "code\controllers\master_controller.dm" diff --git a/code/controllers/hooks-defs.dm b/code/controllers/hooks-defs.dm new file mode 100644 index 00000000000..cb51229c9fb --- /dev/null +++ b/code/controllers/hooks-defs.dm @@ -0,0 +1,17 @@ +/** + * Startup hook. + * Called in world.dm when the server starts. + */ +/hook/startup + +/** + * Roundstart hook. + * Called in gameticker.dm when a round starts. + */ +/hook/roundstart + +/** + * Roundend hook. + * Called in gameticker.dm when a round ends. + */ +/hook/roundend