From 60c6a2ea9202f03f228c9b15d6d7be68d31e4a3e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 23 Jul 2014 22:34:04 -0400 Subject: [PATCH 01/12] Fixes fever temperature not being reached --- code/modules/organs/organ_external.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b87fa2f277..0741b0fb12 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -393,10 +393,10 @@ Note that amputating the affected organ does in fact remove the infection from t if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature - var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/(INFECTION_LEVEL_ONE+300), 1) + owner.species.body_temperature - if (owner.bodytemperature < fever_temperature) - //world << "fever: [owner.bodytemperature] < [fever_temperature], raising temperature." - owner.bodytemperature++ + var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/(INFECTION_LEVEL_TWO), 1) + owner.species.body_temperature + if (fever_temperature > owner.bodytemperature) + //need to make sure we raise temperature fast enough to get around environmental cooling preventing us from reaching fever_temperature + owner.bodytemperature += (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1 if(prob(round(germ_level/10))) if (antibiotics < 5) From d9f70c2fd2f377fe4719612841dddcff158d845f Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 23 Jul 2014 22:35:04 -0400 Subject: [PATCH 02/12] Adjusts the rate that infections deal toxin damage --- code/modules/organs/organ_external.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 0741b0fb12..80ac3bf37b 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -393,7 +393,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature - var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/(INFECTION_LEVEL_TWO), 1) + owner.species.body_temperature + var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_TWO, 1) + owner.species.body_temperature if (fever_temperature > owner.bodytemperature) //need to make sure we raise temperature fast enough to get around environmental cooling preventing us from reaching fever_temperature owner.bodytemperature += (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1 @@ -402,7 +402,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (antibiotics < 5) germ_level++ - if (prob(5)) //adjust this to tweak how fast people take toxin damage from infections + if (prob(10)) //adjust this to tweak how fast people take toxin damage from infections owner.adjustToxLoss(1) if(germ_level >= INFECTION_LEVEL_TWO && antibiotics < 5) From 78e4e259db901df447a0502713cf15aad2977afc Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 23 Jul 2014 22:41:52 -0400 Subject: [PATCH 03/12] Fixes icons not being updated for necrosis --- code/modules/organs/organ_external.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 80ac3bf37b..ea0590152e 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -441,6 +441,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (!(status & ORGAN_DEAD)) status |= ORGAN_DEAD owner << "You can't feel your [display_name] anymore..." + owner.update_body(1) germ_level++ owner.adjustToxLoss(1) From f8d478fcbbb5d2a6e202c4ca02571c1cf3973d1f Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Wed, 23 Jul 2014 20:51:58 -0700 Subject: [PATCH 04/12] Updates to gun targeting UI. Fixes #5710 --- code/_onclick/hud/human.dm | 37 +++++++++++++--------- code/modules/client/preferences_toggles.dm | 2 +- code/modules/projectiles/targeting.dm | 23 ++------------ 3 files changed, 26 insertions(+), 36 deletions(-) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index ca053f86e6..bf39744524 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -13,6 +13,8 @@ using.icon = ui_style using.icon_state = "intent_"+mymob.a_intent using.screen_loc = ui_acti + using.color = ui_color + using.alpha = ui_alpha using.layer = 20 src.adding += using action_intent = using @@ -27,6 +29,7 @@ using.name = "help" using.icon = ico using.screen_loc = ui_acti + using.alpha = ui_alpha using.layer = 21 src.adding += using help_intent = using @@ -38,6 +41,7 @@ using.name = "disarm" using.icon = ico using.screen_loc = ui_acti + using.alpha = ui_alpha using.layer = 21 src.adding += using disarm_intent = using @@ -49,6 +53,7 @@ using.name = "grab" using.icon = ico using.screen_loc = ui_acti + using.alpha = ui_alpha using.layer = 21 src.adding += using grab_intent = using @@ -60,6 +65,7 @@ using.name = "harm" using.icon = ico using.screen_loc = ui_acti + using.alpha = ui_alpha using.layer = 21 src.adding += using hurt_intent = using @@ -440,23 +446,24 @@ //Handle the gun settings buttons mymob.gun_setting_icon = new /obj/screen/gun/mode(null) + //mymob.gun_setting_icon.color = ui_color + mymob.gun_setting_icon.alpha = ui_alpha + + mymob.item_use_icon = new /obj/screen/gun/item(null) + //mymob.item_use_icon.color = ui_color + mymob.item_use_icon.alpha = ui_alpha + + mymob.gun_move_icon = new /obj/screen/gun/move(null) + //mymob.gun_move_icon.color = ui_color + mymob.gun_move_icon.alpha = ui_alpha + + mymob.gun_run_icon = new /obj/screen/gun/run(null) + //mymob.gun_run_icon.color = ui_color + mymob.gun_run_icon.alpha = ui_alpha + if (mymob.client) if (mymob.client.gun_mode) // If in aim mode, correct the sprite mymob.gun_setting_icon.dir = 2 - for(var/obj/item/weapon/gun/G in mymob) // If targeting someone, display other buttons - if (G.target) - mymob.item_use_icon = new /obj/screen/gun/item(null) - if (mymob.client.target_can_click) - mymob.item_use_icon.dir = 1 - src.adding += mymob.item_use_icon - mymob.gun_move_icon = new /obj/screen/gun/move(null) - if (mymob.client.target_can_move) - mymob.gun_move_icon.dir = 1 - mymob.gun_run_icon = new /obj/screen/gun/run(null) - if (mymob.client.target_can_run) - mymob.gun_run_icon.dir = 1 - src.adding += mymob.gun_run_icon - src.adding += mymob.gun_move_icon mymob.client.screen = null @@ -495,7 +502,7 @@ for(var/obj/item/I in src) if(I.icon_action_button) var/obj/screen/item_action/A = new(hud_used) - + //A.icon = 'icons/mob/screen1_action.dmi' //A.icon_state = I.icon_action_button A.icon = ui_style2icon(client.prefs.UI_style) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 6224bf8168..2165322153 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -25,7 +25,7 @@ src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"]." prefs.save_preferences() feedback_add_details("admin_verb","TGR") - + /client/proc/toggle_hear_radio() set name = "Show/Hide RadioChatter" set category = "Preferences" diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index f2c57c0f0e..391ed3396e 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -250,42 +250,25 @@ client/var //These are called by the on-screen buttons, adjusting what the victim can and cannot do. client/proc/add_gun_icons() - if (!usr.item_use_icon) - usr.item_use_icon = new /obj/screen/gun/item(null) - usr.item_use_icon.icon_state = "no_item[target_can_click]" - usr.item_use_icon.name = "[target_can_click ? "Disallow" : "Allow"] Item Use" - - if (!usr.gun_move_icon) - usr.gun_move_icon = new /obj/screen/gun/move(null) - usr.gun_move_icon.icon_state = "no_walk[target_can_move]" - usr.gun_move_icon.name = "[target_can_move ? "Disallow" : "Allow"] Walking" - - if (target_can_move && !usr.gun_run_icon) - usr.gun_run_icon = new /obj/screen/gun/run(null) - usr.gun_run_icon.icon_state = "no_run[target_can_run]" - usr.gun_run_icon.name = "[target_can_run ? "Disallow" : "Allow"] Running" - screen += usr.item_use_icon screen += usr.gun_move_icon if (target_can_move) screen += usr.gun_run_icon + + client/proc/remove_gun_icons() if(!usr) return 1 // Runtime prevention on N00k agents spawning with SMG screen -= usr.item_use_icon screen -= usr.gun_move_icon if (target_can_move) screen -= usr.gun_run_icon - del usr.gun_move_icon - del usr.item_use_icon - del usr.gun_run_icon client/verb/ToggleGunMode() set hidden = 1 gun_mode = !gun_mode if(gun_mode) usr << "You will now take people captive." - add_gun_icons() else usr << "You will now shoot where you target." for(var/obj/item/weapon/gun/G in usr) @@ -302,7 +285,7 @@ client/verb/AllowTargetMove() target_can_move = !target_can_move if(target_can_move) usr << "Target may now walk." - usr.gun_run_icon = new /obj/screen/gun/run(null) //adding icon for running permission + //usr.gun_run_icon = new /obj/screen/gun/run(null) //adding icon for running permission screen += usr.gun_run_icon else usr << "Target may no longer move." From 25bd9c3187241aa54620dcf191cc6ba070e8f804 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Wed, 23 Jul 2014 21:12:03 -0700 Subject: [PATCH 05/12] fixes #4961 --- code/game/machinery/telecomms/logbrowser.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 968b6cf1dc..82a80822e6 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -73,7 +73,9 @@ var/mob/M = new mobtype if(ishuman(M) || isbrain(M)) - race = "Human" + var/mob/living/carbon/human/H = M + race = "[H.species.name]" + else if(ismonkey(M)) race = "Monkey" From 75c1a4bac301b6d08ea0f67c1c6dd8946c709ae6 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Wed, 23 Jul 2014 21:26:12 -0700 Subject: [PATCH 06/12] Disabling E-nets after admin discussion. --- code/game/gamemodes/events/space_ninja.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index 4d0df9c3f7..cec5fe2e01 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -671,7 +671,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjablade verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjastar - verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet + //verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet s_initialized=1 slowdown=0 @@ -682,7 +682,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjablade verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjastar - verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjanet + //verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjanet //=======//KAMIKAZE VERBS//=======// From bb336b76915a386227ed5ddeddc8c076701b127b Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Wed, 23 Jul 2014 21:48:32 -0700 Subject: [PATCH 07/12] temporary fix for #4907 --- code/modules/projectiles/guns/energy/nuclear.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 7a0dd8545a..93706fe46c 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -30,6 +30,11 @@ projectile_type = "/obj/item/projectile/beam/stun" modifystate = "energystun" update_icon() + if(user.l_hand == src) + user.update_inv_l_hand() + else + user.update_inv_r_hand() + From 2c7bb6c48ddab94b87941c01239141372315f802 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Thu, 24 Jul 2014 17:01:52 -0700 Subject: [PATCH 08/12] Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. --- code/modules/client/preferences.dm | 9 +-------- code/modules/mob/language.dm | 14 +------------- code/modules/mob/living/carbon/species.dm | 3 +-- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c05a0d9839..7bd69137d7 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -962,14 +962,7 @@ datum/preferences var/datum/language/lang = all_languages[L] if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))||(S && (L in S.secondary_langs)))) new_languages += lang - - //Apparently there's some PHP script that needs to be updated in order to give people whitelist languages. - //This workaround should be removed once that has been properly updated - if (lang.name == "Siik'maas") - new_languages |= all_languages["Siik'tajr"] - if (lang.name == "Siik'tajr") - new_languages |= all_languages["Siik'maas"] - + languages_available = 1 if(!(languages_available)) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 4bd6627122..d54e1a90e7 100755 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -21,25 +21,13 @@ flags = WHITELISTED /datum/language/tajaran - name = "Siik'maas" + name = "Siik'tajr" desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran." speech_verb = "mrowls" colour = "tajaran" key = "j" flags = WHITELISTED -/datum/language/tajaran_sign - name = "Siik'tajr" - desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Spoken by many Tajaran." - speech_verb = "mrowls" - colour = "tajaran_signlang" - key = "y" //only "dfpqxyz" left. - - //need to find a way to resolve possesive macros - signlang_verb = list("flicks their left ear", "flicks their right ear", "swivels their ears", "twitches their tail", "curls the end of their tail", "arches their tail", "wiggles the end of their tail", "waves their tail about", "holds up a claw", "gestures with their left hand", "gestures with their right hand", "gestures with their tail", "gestures with their ears") - - flags = WHITELISTED | NONVERBAL - /datum/language/skrell name = "Skrellian" desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans." diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index b67f78c2e9..4413390538 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -146,8 +146,7 @@ name = "Tajaran" icobase = 'icons/mob/human_races/r_tajaran.dmi' deform = 'icons/mob/human_races/r_def_tajaran.dmi' - language = "Siik'maas" - secondary_langs = list("Siik'tajr") + language = "Siik'tajr" tail = "tajtail" unarmed_type = /datum/unarmed_attack/claws darksight = 8 From a7748c8542f61bcae3aad985b2a014e4a4c00c25 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Fri, 25 Jul 2014 17:05:15 +0400 Subject: [PATCH 09/12] Adds amount of required players to gamemode vote. --- code/controllers/voting.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index ef1e41dd53..e9465bb937 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -12,6 +12,7 @@ datum/controller/vote var/list/voted = list() var/list/voting = list() var/list/current_votes = list() + var/list/additional_text = list() var/auto_muted = 0 New() @@ -63,6 +64,7 @@ datum/controller/vote voted.Cut() voting.Cut() current_votes.Cut() + additional_text.Cut() /* if(auto_muted && !ooc_allowed) auto_muted = 0 @@ -210,6 +212,13 @@ datum/controller/vote if(ticker.current_state >= 2) return 0 choices.Add(config.votable_modes) + var/list/L = typesof(/datum/game_mode) - /datum/game_mode + for (var/F in choices) + for (var/T in L) + var/datum/game_mode/M = new T() + if (M.config_tag == F) + additional_text.Add(" - [M.required_players] players required") + break if("crew_transfer") if(check_rights(R_ADMIN|R_MOD, 0)) question = "End the shift?" @@ -295,9 +304,13 @@ datum/controller/vote var/votes = choices[choices[i]] if(!votes) votes = 0 if(current_votes[C.ckey] == i) - . += "
  • [choices[i]] ([votes] votes)
    • " + . += "
  • [choices[i]] ([votes] votes)" else - . += "
  • [choices[i]] ([votes] votes)
    • " + . += "
  • [choices[i]] ([votes] votes)" + + if (additional_text.len >= i) + . += additional_text[i] + . += "
    • " . += "
    " if(admin) From 19cfe8940cb3b0d8f2845b20263a785953663fb7 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 25 Jul 2014 23:32:05 +0930 Subject: [PATCH 10/12] Added table layout to vote form. --- code/controllers/voting.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index e9465bb937..02d66af123 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -217,7 +217,7 @@ datum/controller/vote for (var/T in L) var/datum/game_mode/M = new T() if (M.config_tag == F) - additional_text.Add(" - [M.required_players] players required") + additional_text.Add("[M.required_players]") break if("crew_transfer") if(check_rights(R_ADMIN|R_MOD, 0)) @@ -299,20 +299,22 @@ datum/controller/vote if(mode) if(question) . += "

    Vote: '[question]'

    " else . += "

    Vote: [capitalize(mode)]

    " - . += "Time Left: [time_remaining] s
      " + . += "Time Left: [time_remaining] s
      " + . += "" for(var/i = 1, i <= choices.len, i++) var/votes = choices[choices[i]] if(!votes) votes = 0 + . += "" if(current_votes[C.ckey] == i) - . += "
    • [choices[i]] ([votes] votes)" + . += "
      • " else - . += "
    • [choices[i]] ([votes] votes)" + . += "
      • " if (additional_text.len >= i) . += additional_text[i] - . += "" + . += "" - . += "
      " + . += "
      ModeVotesNeeds Players
      [choices[i]][votes][choices[i]][votes]
      " if(admin) . += "(Cancel Vote) " else From 005ac89aad1ebcb8893c421ca6dc88f5bf6f0d53 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 25 Jul 2014 23:41:41 +0930 Subject: [PATCH 11/12] Tweaks to previous commit. --- code/controllers/voting.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 02d66af123..1aa410c87b 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -300,7 +300,9 @@ datum/controller/vote if(question) . += "

      Vote: '[question]'

      " else . += "

      Vote: [capitalize(mode)]

      " . += "Time Left: [time_remaining] s
      " - . += "" + . += "
      ModeVotesNeeds Players
      " + if(capitalize(mode) == "Gamemode") .+= "" + for(var/i = 1, i <= choices.len, i++) var/votes = choices[choices[i]] if(!votes) votes = 0 From ec238be981c610296c2d708a36dc45dba55d13fd Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Fri, 25 Jul 2014 16:23:26 -0700 Subject: [PATCH 12/12] Revert and fix for e-nets. --- code/game/gamemodes/events/ninja_equipment.dm | 16 +++++++--------- code/game/gamemodes/events/space_ninja.dm | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 2a7d35b4a5..f6e4a985c0 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -1377,19 +1377,17 @@ It is possible to destroy the net by the occupant or someone else. playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1) anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir) del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0). - else - M.loc = null - M << "\red You appear in a strange place!" + M << "\red You appear in a strange place!" - for(var/mob/O in viewers(src, 3)) - O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2) + for(var/mob/O in viewers(src, 3)) + O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2) - if(!isnull(master))//As long as they still exist. - master << "\blue SUCCESS: \black transport procedure of \the [affecting] complete." + if(!isnull(master))//As long as they still exist. + master << "\blue SUCCESS: \black transport procedure of \the [affecting] complete." - M.captured = 0 //Important. - M.anchored = initial(M.anchored) //Changes the mob's anchored status to the original one; this is not handled by the can_move proc. + M.captured = 0 //Important. + M.anchored = initial(M.anchored) //Changes the mob's anchored status to the original one; this is not handled by the can_move proc. else//And they are free. M << "\blue You are free of the net!" diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index cec5fe2e01..03d9c6a8cd 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -671,7 +671,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjablade verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjastar - //verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet + verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet s_initialized=1 slowdown=0
      ChoicesVotesMinimum Players