| Target(s) | Location | |
| [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "||
| [M.real_name][M.client ? "" : " (No Client)"][M.stat == 2 ? " (DEAD)" : ""] | " dat += "PM | " dat += "FLW | " var/turf/mob_loc = get_turf(M) @@ -406,13 +406,13 @@ dat += "
| [N.name]([N.key])Gang Boss body destroyed! | " dat += "PM | |
| [M.real_name] (Boss)[M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "||
| [M.real_name] (Boss)[M.client ? "" : " (No Client)"][M.stat == 2 ? " (DEAD)" : ""] | " dat += "PM | " dat += "FLW |
| [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "||
| [M.real_name][M.client ? "" : " (No Client)"][M.stat == 2 ? " (DEAD)" : ""] | " dat += "PM |
| "
- if(appearance_isbanned(user))
+ if(jobban_isbanned(user, "appearance"))
dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game. " dat += "Random Name " dat += "Always Random Name: [be_random_name ? "Yes" : "No"] " diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 5719a095b1c..071314025e0 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -558,6 +558,8 @@ setting = FALSE return + var/area/A = get_area(T) + var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T) landing_zone.id = "colony_drop(\ref[src])" landing_zone.name = "Landing Zone" @@ -566,6 +568,8 @@ landing_zone.width = width landing_zone.height = height landing_zone.setDir(lz_dir) + landing_zone.turf_type = T.baseturf + landing_zone.area_type = A.type for(var/obj/machinery/computer/shuttle/S in machines) if(S.shuttleId == shuttle_id) @@ -637,6 +641,9 @@ for(var/S in SSshuttle.stationary) var/obj/docking_port/stationary/SM = S //SM is declared outside so it can be checked for null if(SM.id == "mining_home" || SM.id == "mining_away") + + var/area/A = get_area(landing_spot) + Mport = new(landing_spot) Mport.id = "landing_zone_dock" Mport.name = "landing zone dock" @@ -645,6 +652,9 @@ Mport.width = SM.width Mport.height = SM.height Mport.setDir(dir) + Mport.turf_type = landing_spot.baseturf + Mport.area_type = A.type + break if(!Mport) user << "This station is not equipped with an approprite mining shuttle. Please contact Nanotrasen Support." diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 533e4bc3a5f..b6ea4447421 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -6,18 +6,6 @@ log_say("Ghost/[src.key] : [message]") - if(jobban_isbanned(src, "OOC")) - src << "You have been banned from deadchat." - return - - if (src.client) - if(src.client.prefs.muted & MUTE_DEADCHAT) - src << "You cannot talk in deadchat (muted)." - return - - if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT)) - return - . = src.say_dead(message) /mob/dead/observer/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index d63654ce9e7..0f4de4b6890 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -20,7 +20,7 @@ if(health<= -maxHealth || !getorgan(/obj/item/organ/brain)) death() return - if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= config.health_threshold_crit) + if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT) if(stat == CONSCIOUS) stat = UNCONSCIOUS blind_eyes(1) diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index a8c82a97520..a089a58bd77 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -56,7 +56,7 @@ /mob/living/carbon/brain/can_be_revived() . = 1 - if(!container || health <= config.health_threshold_dead) + if(!container || health <= HEALTH_THRESHOLD_DEAD) return 0 /mob/living/carbon/brain/update_sight() diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 6b6ba71043a..e5e7d511fc0 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -68,7 +68,7 @@ if(brainmob) if(brainmob.client) - if(brainmob.health <= config.health_threshold_dead) + if(brainmob.health <= HEALTH_THRESHOLD_DEAD) user << "It's lifeless and severely damaged." else user << "You can feel the small spark of life still left in this one." diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index dc05ef62dbb..75f731b6e69 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -22,7 +22,7 @@ /mob/living/carbon/brain/update_stat() if(status_flags & GODMODE) return - if(health <= config.health_threshold_dead) + if(health <= HEALTH_THRESHOLD_DEAD) if(stat != DEAD) death() var/obj/item/organ/brain/BR diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 15193870032..9d30f85a661 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -634,7 +634,7 @@ if(!client) return - if(stat == UNCONSCIOUS && health <= config.health_threshold_crit) + if(stat == UNCONSCIOUS && health <= HEALTH_THRESHOLD_CRIT) var/severity = 0 switch(health) if(-20 to -10) severity = 1 @@ -712,10 +712,10 @@ if(status_flags & GODMODE) return if(stat != DEAD) - if(health<= config.health_threshold_dead || !getorgan(/obj/item/organ/brain)) + if(health<= HEALTH_THRESHOLD_DEAD || !getorgan(/obj/item/organ/brain)) death() return - if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= config.health_threshold_crit) + if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT) if(stat == CONSCIOUS) stat = UNCONSCIOUS blind_eyes(1) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 029b628ca26..41f2caab2dc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -837,7 +837,7 @@ var/they_breathe = (!(NOBREATH in C.dna.species.specflags)) var/they_lung = C.getorganslot("lungs") - if(C.health > config.health_threshold_crit) + if(C.health > HEALTH_THRESHOLD_CRIT) return src.visible_message("[src] performs CPR on [C.name]!", "You perform CPR on [C.name].") diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index da3204f6b0e..c218fbb8445 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -10,7 +10,7 @@ total_burn += BP.burn_dam health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute update_stat() - if(((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD ) + if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD) && stat == DEAD ) ChangeToHusk() if(on_fire) shred_clothing() diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index fea4409a2f0..4b25bca1238 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -113,7 +113,7 @@ return 1//Humans can use guns and such /mob/living/carbon/human/InCritical() - return (health <= config.health_threshold_crit && stat == UNCONSCIOUS) + return (health <= HEALTH_THRESHOLD_CRIT && stat == UNCONSCIOUS) /mob/living/carbon/human/reagent_check(datum/reagent/R) return dna.species.handle_chemicals(R,src) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 9184a5aca1a..88455c18f79 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -479,7 +479,7 @@ H.losebreath = 0 var/takes_crit_damage = (!(NOCRITDAMAGE in specflags)) - if((H.health < config.health_threshold_crit) && takes_crit_damage) + if((H.health < HEALTH_THRESHOLD_CRIT) && takes_crit_damage) H.adjustBruteLoss(1) /datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H) @@ -1169,7 +1169,7 @@ if(!breath || (breath.total_moles() == 0) || !lungs) if(H.reagents.has_reagent("epinephrine") && lungs) return - if(H.health >= config.health_threshold_crit) + if(H.health >= HEALTH_THRESHOLD_CRIT) H.adjustOxyLoss(HUMAN_MAX_OXYLOSS) if(!lungs) H.adjustOxyLoss(1) @@ -1329,7 +1329,7 @@ if(!H || !safe_breath_min) //the other args are either: Ok being 0 or Specifically handled. return 0 - if(!(NOBREATH in specflags) || (H.health <= config.health_threshold_crit)) + if(!(NOBREATH in specflags) || (H.health <= HEALTH_THRESHOLD_CRIT)) if(prob(20)) H.emote("gasp") if(breath_pp > 0) diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 4b4d0b45142..181d5dee7f3 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -37,7 +37,7 @@ // If whispering your last words, limit the whisper based on how close you are to death. if(critical) - var/health_diff = round(-config.health_threshold_dead + health) + var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health) // If we cut our message short, abruptly end it with a-.. var/message_len = length(message) message = copytext(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]" diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 4b075b81d06..bc6497ce7cd 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -48,7 +48,7 @@ var/datum/gas_mixture/breath - if(health <= config.health_threshold_crit || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube"))) + if(health <= HEALTH_THRESHOLD_CRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube"))) losebreath++ //Suffocate @@ -311,7 +311,7 @@ if(sleeping) handle_dreams() AdjustSleeping(-1) - if(prob(10) && health>config.health_threshold_crit) + if(prob(10) && health>HEALTH_THRESHOLD_CRIT) emote("snore") var/restingpwr = 1 + 4 * resting diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8208c2d3bea..5c93339314e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1,13 +1,3 @@ -/* I am informed this was added by Giacom to reduce mob-stacking in escape pods. -It's sorta problematic atm due to the shuttle changes I am trying to do -Sorry Giacom. Please don't be mad :( -/mob/living/Life() - ..() - var/area/A = get_area(loc) - if(A && A.push_dir) - push_mob_back(src, A.push_dir) -*/ - /mob/living/New() . = ..() generateStaticOverlay() @@ -216,7 +206,7 @@ Sorry Giacom. Please don't be mad :( set hidden = 1 if (InCritical()) src.attack_log += "[src] has [whispered ? "whispered his final words" : "succumbed to death"] with [round(health, 0.1)] points of health!" - src.adjustOxyLoss(src.health - config.health_threshold_dead) + src.adjustOxyLoss(src.health - HEALTH_THRESHOLD_DEAD) updatehealth() if(!whispered) src << "You have given up life and succumbed to death." @@ -272,7 +262,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/adjustBruteLoss(amount, updating_health=1) if(status_flags & GODMODE) return 0 - bruteloss = Clamp(bruteloss + amount, 0, maxHealth*2) + bruteloss = Clamp((bruteloss + (amount * config.damage_multiplier)), 0, maxHealth*2) if(updating_health) updatehealth() @@ -282,7 +272,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/adjustOxyLoss(amount, updating_health=1) if(status_flags & GODMODE) return 0 - oxyloss = Clamp(oxyloss + amount, 0, maxHealth*2) + oxyloss = Clamp((oxyloss + (amount * config.damage_multiplier)), 0, maxHealth*2) if(updating_health) updatehealth() @@ -299,7 +289,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/adjustToxLoss(amount, updating_health=1) if(status_flags & GODMODE) return 0 - toxloss = Clamp(toxloss + amount, 0, maxHealth*2) + toxloss = Clamp((toxloss + (amount * config.damage_multiplier)), 0, maxHealth*2) if(updating_health) updatehealth() return amount @@ -317,7 +307,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/adjustFireLoss(amount, updating_health=1) if(status_flags & GODMODE) return 0 - fireloss = Clamp(fireloss + amount, 0, maxHealth*2) + fireloss = Clamp((fireloss + (amount * config.damage_multiplier)), 0, maxHealth*2) if(updating_health) updatehealth() @@ -327,7 +317,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/adjustCloneLoss(amount, updating_health=1) if(status_flags & GODMODE) return 0 - cloneloss = Clamp(cloneloss + amount, 0, maxHealth*2) + cloneloss = Clamp((cloneloss + (amount * config.damage_multiplier)), 0, maxHealth*2) if(updating_health) updatehealth() @@ -344,7 +334,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/adjustBrainLoss(amount) if(status_flags & GODMODE) return 0 - brainloss = Clamp(brainloss + amount, 0, maxHealth*2) + brainloss = Clamp((brainloss + (amount * config.damage_multiplier)), 0, maxHealth*2) /mob/living/proc/setBrainLoss(amount) if(status_flags & GODMODE) @@ -541,7 +531,7 @@ Sorry Giacom. Please don't be mad :( //proc called by revive(), to check if we can actually ressuscitate the mob (we don't want to revive him and have him instantly die again) /mob/living/proc/can_be_revived() . = 1 - if(health <= config.health_threshold_dead) + if(health <= HEALTH_THRESHOLD_DEAD) return 0 /mob/living/proc/update_damage_overlays() @@ -1026,7 +1016,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/carbon/human/update_stamina() if(staminaloss) var/total_health = (health - staminaloss) - if(total_health <= config.health_threshold_crit && !stat) + if(total_health <= HEALTH_THRESHOLD_CRIT && !stat) src << "You're too exhausted to keep going..." Weaken(5) setStaminaLoss(health - 2) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index d24a997edaf..946f2e04900 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -60,7 +60,7 @@ if(status_flags & GODMODE) return if(stat != DEAD) - if(health <= config.health_threshold_dead) + if(health <= HEALTH_THRESHOLD_DEAD) death() return else if(stat == UNCONSCIOUS) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index c4253391ec3..a10829bc0ae 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -152,7 +152,7 @@ var/global/list/parasites = list() //all currently existing/living guardians if(summoner) var/resulthealth if(iscarbon(summoner)) - resulthealth = round((abs(config.health_threshold_dead - summoner.health) / abs(config.health_threshold_dead - summoner.maxHealth)) * 100) + resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100) else resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5) stat(null, "Summoner Health: [resulthealth]%") @@ -197,7 +197,7 @@ var/global/list/parasites = list() //all currently existing/living guardians if(summoner && hud_used && hud_used.healths) var/resulthealth if(iscarbon(summoner)) - resulthealth = round((abs(config.health_threshold_dead - summoner.health) / abs(config.health_threshold_dead - summoner.maxHealth)) * 100) + resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100) else resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5) hud_used.healths.maptext = " [resulthealth]% "
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 1d4657681d8..3bd798886b1 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -83,26 +83,21 @@
//////////////HOSTILE MOB TARGETTING AND AGGRESSION////////////
-
/mob/living/simple_animal/hostile/proc/ListTargets()//Step 1, find out what we can see
. = list()
if(!search_objects)
var/list/Mobs = hearers(vision_range, targets_from) - src //Remove self, so we don't suicide
. += Mobs
- var/hostile_machines = list()
- for(var/mecha in mechas_list)
- hostile_machines += mecha
- for(var/obj/machinery/porta_turret/P in machines)
- hostile_machines += P
- for(var/M in hostile_machines)
- if(get_dist(M, targets_from) <= vision_range && can_see(targets_from, M, vision_range))
- . += M
+ var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/mecha))
+
+ for(var/HM in typecache_filter_list(range(vision_range, targets_from), hostile_machines))
+ if(can_see(targets_from, HM, vision_range))
+ . += HM
else
var/list/Objects = oview(vision_range, targets_from)
. += Objects
-
/mob/living/simple_animal/hostile/proc/FindTarget(var/list/possible_targets, var/HasTargetsList = 0)//Step 2, filter down possible targets to things we actually care about
. = list()
if(!HasTargetsList)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index abc97e1c958..2966bb0e964 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -290,23 +290,23 @@
/mob/living/simple_animal/adjustBruteLoss(amount)
if(damage_coeff[BRUTE])
- . = adjustHealth(amount*damage_coeff[BRUTE])
+ . = adjustHealth(amount * damage_coeff[BRUTE] * config.damage_multiplier)
/mob/living/simple_animal/adjustFireLoss(amount)
if(damage_coeff[BURN])
- . = adjustHealth(amount*damage_coeff[BURN])
+ . = adjustHealth(amount * damage_coeff[BURN] * config.damage_multiplier)
/mob/living/simple_animal/adjustOxyLoss(amount)
if(damage_coeff[OXY])
- . = adjustHealth(amount*damage_coeff[OXY])
+ . = adjustHealth(amount * damage_coeff[OXY] * config.damage_multiplier)
/mob/living/simple_animal/adjustToxLoss(amount)
if(damage_coeff[TOX])
- . = adjustHealth(amount*damage_coeff[TOX])
+ . = adjustHealth(amount * damage_coeff[TOX] * config.damage_multiplier)
/mob/living/simple_animal/adjustCloneLoss(amount)
if(damage_coeff[CLONE])
- . = adjustHealth(amount*damage_coeff[CLONE])
+ . = adjustHealth(amount * damage_coeff[CLONE] * config.damage_multiplier)
/mob/living/simple_animal/adjustStaminaLoss(amount)
return
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 367fcbb6a35..a4cf1c4a7bb 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -234,7 +234,7 @@
Feedstop(0, 0)
return
- add_nutrition(rand(7,15))
+ add_nutrition((rand(7,15) * config.damage_multiplier))
//Heal yourself.
adjustBruteLoss(-3)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 565e30cdc23..e55f2be543d 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -419,7 +419,7 @@
var/mob/living/carbon/human/new_character = new(loc)
- if(config.force_random_names || appearance_isbanned(src))
+ if(config.force_random_names || jobban_isbanned(src, "appearance"))
client.prefs.random_character()
client.prefs.real_name = client.prefs.pref_species.random_name(gender,1)
client.prefs.copy_to(new_character)
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 997dc6a527e..e7ceb3e1eef 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -35,6 +35,18 @@
usr << "Speech is currently admin-disabled."
return
+ if(jobban_isbanned(src, "OOC"))
+ src << "You have been banned from deadchat."
+ return
+
+ if (src.client)
+ if(src.client.prefs.muted & MUTE_DEADCHAT)
+ src << "You cannot talk in deadchat (muted)."
+ return
+
+ if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
+ return
+
var/mob/dead/observer/O = src
if(isobserver(src) && O.deadchat_name)
name = "[O.deadchat_name]"
diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm
index 79a7c913c2e..5742faa9311 100644
--- a/code/modules/modular_computers/computers/machinery/modular_console.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_console.dm
@@ -13,7 +13,7 @@
base_idle_power_usage = 100
base_active_power_usage = 500
max_hardware_size = 3
- steel_sheet_cost = 20
+ steel_sheet_cost = 10
light_strength = 2
_max_damage = 300
_break_damage = 150
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index ffaeaa3e441..770074ad0a1 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/medbeam
name = "Medical Beamgun"
- desc = "Delivers medical nanites in a focused beam."
+ desc = "Don't cross the streams!"
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 09a02d973cf..42b001e1ddd 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -96,8 +96,8 @@
/obj/item/bodypart/proc/take_damage(brute, burn)
if(owner && (owner.status_flags & GODMODE))
return 0 //godmode
- brute = max(brute,0)
- burn = max(burn,0)
+ brute = max(brute * config.damage_multiplier,0)
+ burn = max(burn * config.damage_multiplier,0)
if(status == ORGAN_ROBOTIC) //This makes robolimbs not damageable by chems and makes it stronger
diff --git a/code/world.dm b/code/world.dm
index 83454220e28..06d8097d740 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -39,7 +39,6 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
load_admins()
if(config.usewhitelist)
load_whitelist()
- appearance_loadbanfile()
LoadBans()
investigate_reset()
@@ -169,6 +168,13 @@ var/last_irc_status = 0
else
return IrcPm(input["adminmsg"],input["msg"],input["sender"])
+ else if("namecheck" in input)
+ if(!key_valid)
+ return "Bad Key"
+ else
+ log_admin("IRC Name Check: [input["sender"]] on [input["namecheck"]]")
+ message_admins("IRC name checking on [input["namecheck"]] from [input["sender"]]")
+ return keywords_lookup(input["namecheck"],1)
/world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time)
diff --git a/config/config.txt b/config/config.txt
index 32b7a5549f7..46204abb1aa 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -172,6 +172,9 @@ ALLOW_HOLIDAYS
##Remove the # mark if you are going to use the SVN irc bot to relay adminhelps
#USEIRCBOT
+##Uncomment to show the names of the admin sending a pm from IRC instead of showing as a stealthmin.
+#SHOW_IRC_NAME
+
##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother.
TICKLAG 0.5
diff --git a/config/game_options.txt b/config/game_options.txt
index 798460b4c1b..9f7e778833d 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -1,11 +1,7 @@
### HEALTH ###
-# level of health at which a mob becomes unconscious (crit)
-HEALTH_THRESHOLD_CRIT 0
-
-# level of health at which a mob becomes dead
-HEALTH_THRESHOLD_DEAD -100
-
+#Damage multiplier, effects both weapons and healing on all mobs. For example, 1.25 would result in 25% higher damage.
+DAMAGE_MULTIPLIER 1
### REVIVAL ###
diff --git a/html/changelog.html b/html/changelog.html
index 84fd2470d95..7cefd0ea105 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,59 @@
-->
+
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index fec90c2c882..dd6496703ff 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6680,3 +6680,48 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
key presses. Movements should now be ~25-50ms more responsive.
Shadowlight213:
- rscadd: Adds modular computers
+2016-08-21:
+ Ergovisavi:
+ - tweak: Consolidates the fulton packs into a single item and makes them more user
+ friendly
+ Google Play Store:
+ - spellcheck: Minor Text Fixes.
+ Incoming5643:
+ - rscadd: Smuggler satchels left behind hidden on the station can now reappear in
+ a later round.
+ - experiment: There's absolutely no way of knowing when exactly it will reappear
+ however...
+ - rscadd: Only one item in the satchel will remain when the satchel reappears.
+ - rscadd: Items are saved in their initial forms, so saving things like chemical
+ grenades will only disappoint you.
+ - rscadd: The item pool is map specific and needs to be a certain size before satchels
+ can start reappearing, so get to hiding that loot!
+ - rscadd: The staff of change has been expanded to turn you into even more things
+ that don't have hands.
+ Jalleo:
+ - bugfix: Gulag Teleporter of two issues any more please report them.
+ Jordie0608:
+ - rscadd: Advanced Energy Guns once again have a chance to irradiate you if EMPed.
+ Kor:
+ - rscadd: Kinetic Accelerators are now modular. You can find mod kits in the mining
+ vendor and in RnD.
+ - bugfix: Chaplain's dormant spellblade is no longer invisible.
+ Papa Bones:
+ - rscadd: A new, scandalous outfit is now available as contraband from the clothesmate
+ vendor, check it out! Fulfill your deep, dark fantasies.
+ Shadowlight213:
+ - tweak: Service and cargo have lost roundstart tablets and engineering has gained
+ them
+ - tweak: you can now charge battery modules in cell chargers. Use a screwdriver
+ on a computer to remove them. As a note, tablets and laptops can be charged
+ directly by placing them in a security charger.
+ WJohnston:
+ - rscadd: Metastation and Boxstation now boast auxillary mining construction rooms
+ in arrivals. These allow you to build a base and then launch it to wherever
+ you want on lavaland.
+ Wjohnston, Gun Hog:
+ - rscadd: Aliens with Neurotoxic Spit readied will now have drooling animations.
+ - rscadd: Hunters may now safely leap over lava.
+ - tweak: Hulk punches no longer stun Xenos.
+ - tweak: Alien evolve and promotion buttons updated to current Xeno sprites
+ - bugfix: Handcuff sprites for Xenos now show properly.
diff --git a/html/changelogs/AutoChangeLog-pr-19892.yml b/html/changelogs/AutoChangeLog-pr-19892.yml
deleted file mode 100644
index f688c20db62..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19892.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "WJohnston"
-delete-after: True
-changes:
- - rscadd: "Metastation and Boxstation now boast auxillary mining construction rooms in arrivals. These allow you to build a base and then launch it to wherever you want on lavaland."
diff --git a/html/changelogs/AutoChangeLog-pr-19915.yml b/html/changelogs/AutoChangeLog-pr-19915.yml
deleted file mode 100644
index 66a03dafb41..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19915.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Jordie0608"
-delete-after: True
-changes:
- - rscadd: "Advanced Energy Guns once again have a chance to irradiate you if EMPed."
diff --git a/html/changelogs/AutoChangeLog-pr-19918.yml b/html/changelogs/AutoChangeLog-pr-19918.yml
deleted file mode 100644
index 8c87ca947a2..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19918.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Wjohnston, Gun Hog"
-delete-after: True
-changes:
- - rscadd: "Aliens with Neurotoxic Spit readied will now have drooling animations."
- - rscadd: "Hunters may now safely leap over lava."
- - tweak: "Hulk punches no longer stun Xenos."
- - tweak: "Alien evolve and promotion buttons updated to current Xeno sprites"
- - bugfix: "Handcuff sprites for Xenos now show properly."
diff --git a/html/changelogs/AutoChangeLog-pr-19925.yml b/html/changelogs/AutoChangeLog-pr-19925.yml
deleted file mode 100644
index 66367295a45..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19925.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Incoming5643"
-delete-after: True
-changes:
- - rscadd: "The staff of change has been expanded to turn you into even more things that don't have hands."
diff --git a/html/changelogs/AutoChangeLog-pr-19926.yml b/html/changelogs/AutoChangeLog-pr-19926.yml
deleted file mode 100644
index efeadd255a8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19926.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Google Play Store"
-delete-after: True
-changes:
- - spellcheck: "Minor Text Fixes."
diff --git a/html/changelogs/AutoChangeLog-pr-19928.yml b/html/changelogs/AutoChangeLog-pr-19928.yml
deleted file mode 100644
index 23a498956ae..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19928.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Shadowlight213"
-delete-after: True
-changes:
- - tweak: "Service and cargo have lost roundstart tablets and engineering has gained them"
- - tweak: "you can now charge battery modules in cell chargers. Use a screwdriver on a computer to remove them. As a note, tablets and laptops can be charged directly by placing them in a security charger."
diff --git a/html/changelogs/AutoChangeLog-pr-19930.yml b/html/changelogs/AutoChangeLog-pr-19930.yml
deleted file mode 100644
index adfa06a01d9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19930.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Papa Bones"
-delete-after: True
-changes:
- - rscadd: "A new, scandalous outfit is now available as contraband from the clothesmate vendor, check it out! Fulfill your deep, dark fantasies."
diff --git a/html/changelogs/AutoChangeLog-pr-19942.yml b/html/changelogs/AutoChangeLog-pr-19942.yml
deleted file mode 100644
index c69b673d62b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19942.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kor"
-delete-after: True
-changes:
- - rscadd: "Kinetic Accelerators are now modular. You can find mod kits in the mining vendor and in RnD."
diff --git a/html/changelogs/AutoChangeLog-pr-19944.yml b/html/changelogs/AutoChangeLog-pr-19944.yml
deleted file mode 100644
index 23ce404728d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19944.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ergovisavi"
-delete-after: True
-changes:
- - tweak: "Consolidates the fulton packs into a single item and makes them more user friendly"
diff --git a/html/changelogs/AutoChangeLog-pr-19949.yml b/html/changelogs/AutoChangeLog-pr-19949.yml
deleted file mode 100644
index 6962b8ac4fb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19949.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kor"
-delete-after: True
-changes:
- - bugfix: "Chaplain's dormant spellblade is no longer invisible."
diff --git a/tgstation.dme b/tgstation.dme
index 7b792308873..093ed54235b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -152,6 +152,7 @@
#include "code\controllers\subsystem\npcpool.dm"
#include "code\controllers\subsystem\objects.dm"
#include "code\controllers\subsystem\pai.dm"
+#include "code\controllers\subsystem\persistence.dm"
#include "code\controllers\subsystem\pool.dm"
#include "code\controllers\subsystem\radio.dm"
#include "code\controllers\subsystem\server_maintenance.dm"
@@ -378,8 +379,6 @@
#include "code\game\gamemodes\miniantags\abduction\machinery\pad.dm"
#include "code\game\gamemodes\miniantags\bot_swarm\swarmer.dm"
#include "code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm"
-#include "code\game\gamemodes\miniantags\hades\hades.dm"
-#include "code\game\gamemodes\miniantags\hades\hades_chapel.dm"
#include "code\game\gamemodes\miniantags\monkey\monkey.dm"
#include "code\game\gamemodes\miniantags\morph\morph.dm"
#include "code\game\gamemodes\miniantags\revenant\revenant.dm"
@@ -840,7 +839,6 @@
#include "code\modules\admin\admin_memo.dm"
#include "code\modules\admin\admin_ranks.dm"
#include "code\modules\admin\admin_verbs.dm"
-#include "code\modules\admin\banappearance.dm"
#include "code\modules\admin\banjob.dm"
#include "code\modules\admin\create_mob.dm"
#include "code\modules\admin\create_object.dm"
21 August 2016+Ergovisavi updated:+
Google Play Store updated:+
Incoming5643 updated:+
Jalleo updated:+
Jordie0608 updated:+
Kor updated:+
Papa Bones updated:+
Shadowlight213 updated:+
WJohnston updated:+
Wjohnston, Gun Hog updated:+
17 August 2016Basilman updated:
19 June 2016-Joan updated:-
Kor and Iamgoofball updated:-
Quiltyquilty updated:-
Wizard's Federation updated:-
Xhuis updated:-
coiax updated:-
16 June 2016-GunHog updated:-
Joan updated:-
Quiltyquilty updated:-
coiax updated:-
|