[t_He] [t_is] limp and unresponsive; there are no signs of life"
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index a48124e412..2c034dc64f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -119,6 +119,8 @@
var/obj/item/thing = C.get_item_by_slot(slot_id)
if(thing && (!thing.species_exception || !is_type_in_list(src,thing.species_exception)))
C.dropItemToGround(thing)
+ if(C.hud_used)
+ C.hud_used.update_locked_slots()
// this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits
if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 0390661c78..4d68188686 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -9,7 +9,7 @@
punchdamagelow = 5
punchdamagehigh = 14
punchstunthreshold = 11 //about 40% chance to stun
- no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform)
+ no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform, slot_s_store)
nojumpsuit = 1
sexes = 1
damage_overlay_type = ""
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index dce38bd664..56c43211e4 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -28,7 +28,7 @@
//Holopad
if(istype(ai.current, /obj/machinery/holopad))
var/obj/machinery/holopad/H = ai.current
- H.move_hologram(ai)
+ H.move_hologram(ai, T)
/mob/camera/aiEye/Move()
return 0
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm b/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm
new file mode 100644
index 0000000000..de1bf0b308
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm
@@ -0,0 +1,85 @@
+/mob/living/simple_animal/hostile/jungle
+ vision_range = 5
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ faction = list("jungle")
+ weather_immunities = list("acid")
+ obj_damage = 30
+ environment_smash = 2
+ minbodytemp = 0
+ maxbodytemp = 450
+ response_help = "pokes"
+ response_disarm = "shoves"
+ response_harm = "strikes"
+ status_flags = 0
+ a_intent = INTENT_HARM
+ see_in_dark = 4
+ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+ mob_size = MOB_SIZE_LARGE
+
+
+
+//Mega arachnid
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid
+ name = "mega arachnid"
+ desc = "Though physically imposing, it prefers to ambush its prey, and it will only engage with an already crippled opponent."
+ melee_damage_lower = 30
+ melee_damage_upper = 30
+ maxHealth = 300
+ health = 300
+ speed = 1
+ ranged = 1
+ pixel_x = -16
+ move_to_delay = 10
+ aggro_vision_range = 9
+ speak_emote = list("chitters")
+ attack_sound = 'sound/weapons/bladeslice.ogg'
+ ranged_cooldown_time = 60
+ projectiletype = /obj/item/projectile/mega_arachnid
+ projectilesound = 'sound/weapons/pierce.ogg'
+ icon = 'icons/mob/jungle/arachnid.dmi'
+ icon_state = "arachnid"
+ icon_living = "arachnid"
+ icon_dead = "dead_purple"
+ alpha = 50
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/Life()
+ ..()
+ if(target && ranged_cooldown > world.time && iscarbon(target))
+ var/mob/living/carbon/C = target
+ if(!C.legcuffed && C.health < 50)
+ retreat_distance = 9
+ minimum_distance = 9
+ alpha = 125
+ return
+ retreat_distance = 0
+ minimum_distance = 0
+ alpha = 255
+
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/Aggro()
+ ..()
+ alpha = 255
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/LoseAggro()
+ ..()
+ alpha = 50
+
+/obj/item/projectile/mega_arachnid
+ name = "flesh snare"
+ nodamage = 1
+ damage = 0
+ icon_state = "tentacle_end"
+
+/obj/item/projectile/mega_arachnid/on_hit(atom/target, blocked = 0)
+ if(iscarbon(target) && blocked < 100)
+ var/obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid/B = new /obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid(get_turf(target))
+ B.Crossed(target)
+ ..()
+
+/obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid
+ name = "fleshy restraints"
+ desc = "Used by mega arachnids to immobilize their prey."
+ flags = DROPDEL
+ icon_state = "tentacle_end"
+ icon = 'icons/obj/projectiles.dmi'
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 8971d33b28..f9bcfe1b6f 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -16,7 +16,7 @@
response_disarm = "shoos"
response_harm = "stomps on"
emote_see = list("jiggles", "bounces in place")
- speak_emote = list("telepathically chirps")
+ speak_emote = list("blorbles")
bubble_icon = "slime"
initial_languages = list(/datum/language/common, /datum/language/slime)
@@ -31,10 +31,10 @@
see_in_dark = 8
- verb_say = "telepathically chirps"
- verb_ask = "telepathically asks"
- verb_exclaim = "telepathically cries"
- verb_yell = "telephatically cries"
+ verb_say = "blorbles"
+ verb_ask = "inquisitively blorbles"
+ verb_exclaim = "loudly blorbles"
+ verb_yell = "loudly blorbles"
// canstun and canweaken don't affect slimes because they ignore stun and weakened variables
// for the sake of cleanliness, though, here they are.
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 24b4d228cc..819f7f3db2 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -351,6 +351,8 @@
/mob/proc/spin(spintime, speed)
set waitfor = 0
var/D = dir
+ if((spintime < 1)||(speed < 1)||!spintime||!speed)
+ return
while(spintime >= speed)
sleep(speed)
switch(D)
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index dfbf3fe50b..9fe043a4a0 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -28,11 +28,12 @@
/obj/machinery/power/generator/Initialize(mapload)
- . = ..()
+ . = ..()
var/obj/machinery/atmospherics/components/binary/circulator/circpath = /obj/machinery/atmospherics/components/binary/circulator
cold_circ = locate(circpath) in get_step(src, cold_dir)
hot_circ = locate(circpath) in get_step(src, hot_dir)
connect_to_network()
+ SSair.atmos_machinery += src
if(cold_circ)
switch(cold_dir)
@@ -55,6 +56,9 @@
update_icon()
+/obj/machinery/power/generator/Destroy()
+ SSair.atmos_machinery -= src
+ return ..()
/obj/machinery/power/generator/update_icon()
@@ -63,21 +67,20 @@
else
cut_overlays()
- if(lastgenlev != 0)
- add_overlay("teg-op[lastgenlev]")
+ var/L = min(round(lastgenlev/100000),11)
+ if(L != 0)
+ add_overlay(image('icons/obj/power.dmi', "teg-op[L]"))
- add_overlay("teg-oc[lastcirc]")
+ add_overlay("teg-oc[lastcirc]")
#define GENRATE 800 // generator output coefficient from Q
-/obj/machinery/power/generator/process()
+/obj/machinery/power/generator/process_atmos()
if(!cold_circ || !hot_circ)
return
- lastgen = 0
-
if(powernet)
//to_chat(world, "cold_circ and hot_circ pass")
@@ -104,7 +107,7 @@
var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
var/heat = energy_transfer*(1-efficiency)
- lastgen = energy_transfer*efficiency
+ lastgen += energy_transfer*efficiency
//to_chat(world, "lastgen = [lastgen]; heat = [heat]; delta_temperature = [delta_temperature]; hot_air_heat_capacity = [hot_air_heat_capacity]; cold_air_heat_capacity = [cold_air_heat_capacity];")
@@ -113,7 +116,7 @@
//to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]")
- add_avail(lastgen)
+ //add_avail(lastgen) This is done in process now
// update icon overlays only if displayed level has changed
if(hot_air)
@@ -124,15 +127,23 @@
var/datum/gas_mixture/cold_circ_air1 = cold_circ.AIR1
cold_circ_air1.merge(cold_air)
- var/genlev = max(0, min( round(11*lastgen / 100000), 11))
+ update_icon()
+
var/circ = "[cold_circ && cold_circ.last_pressure_delta > 0 ? "1" : "0"][hot_circ && hot_circ.last_pressure_delta > 0 ? "1" : "0"]"
- if((genlev != lastgenlev) || (circ != lastcirc))
- lastgenlev = genlev
+ if(circ != lastcirc)
lastcirc = circ
update_icon()
src.updateDialog()
+/obj/machinery/power/generator/process()
+ //Setting this number higher just makes the change in power output slower, it doesnt actualy reduce power output cause **math**
+ var/power_output = round(lastgen / 10)
+ add_avail(power_output)
+ lastgenlev = power_output
+ lastgen -= power_output
+ ..()
+
/obj/machinery/power/generator/attack_hand(mob/user)
if(..())
user << browse(null, "window=teg")
@@ -151,7 +162,13 @@
t += ""
- t += "Output: [round(lastgen)] W"
+ var/displaygen = lastgenlev
+ if(displaygen < 1000000) //less than a MW
+ displaygen /= 1000
+ t += "Output: [round(displaygen,0.01)] kW"
+ else
+ displaygen /= 1000000
+ t += "Output: [round(displaygen,0.01)] MW"
t += "
"
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 9deebdfe10..fb2df4deeb 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -14,6 +14,7 @@
light_power = 0.7
light_range = 15
light_color = rgb(255, 0, 0)
+ gender = FEMALE
var/clashing = FALSE //If Nar-Sie is fighting Ratvar
/obj/singularity/narsie/large
@@ -26,8 +27,8 @@
grav_pull = 10
consume_range = 12 //How many tiles out do we eat
-/obj/singularity/narsie/large/New()
- ..()
+/obj/singularity/narsie/large/Initialize()
+ . = ..()
send_to_playing_players("NAR-SIE HAS RISEN")
send_to_playing_players(pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg'))
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 3b0bc3087b..1a308ed471 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -29,12 +29,12 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
dangerous_possession = TRUE
-/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
+/obj/singularity/Initialize(mapload, starting_energy = 50)
//CARN: admin-alert for chuckle-fuckery.
admin_investigate_setup()
src.energy = starting_energy
- ..()
+ . = ..()
START_PROCESSING(SSobj, src)
GLOB.poi_list |= src
GLOB.singularities |= src
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 4b48d19857..a580b63e55 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -129,6 +129,7 @@
/obj/machinery/power/supermatter_shard/Initialize()
. = ..()
+ SSair.atmos_machinery += src
countdown = new(src)
countdown.start()
GLOB.poi_list |= src
@@ -139,6 +140,7 @@
/obj/machinery/power/supermatter_shard/Destroy()
investigate_log("has been destroyed.", "supermatter")
+ SSair.atmos_machinery -= src
QDEL_NULL(radio)
GLOB.poi_list -= src
QDEL_NULL(countdown)
@@ -181,7 +183,7 @@
E.energy = power
qdel(src)
-/obj/machinery/power/supermatter_shard/process()
+/obj/machinery/power/supermatter_shard/process_atmos()
var/turf/T = loc
if(isnull(T)) // We have a null turf...something is wrong, stop processing this entity.
@@ -296,6 +298,7 @@
if(produces_gas)
env.merge(removed)
+ air_update_turf()
for(var/mob/living/carbon/human/l in view(src, HALLUCINATION_RANGE(power))) // If they can see it without mesons on. Bad on them.
if(!istype(l.glasses, /obj/item/clothing/glasses/meson))
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index fbb82cb36a..df08899140 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -40,6 +40,11 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
var/energy_to_raise = 32
var/energy_to_lower = -20
+/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
+ . = ..()
+ if(!is_miniball)
+ set_light(10, 7, "#EEEEFF")
+
/obj/singularity/energy_ball/ex_act(severity, target)
return
@@ -54,6 +59,11 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
. = ..()
+/obj/singularity/energy_ball/admin_investigate_setup()
+ if(istype(loc, /obj/singularity/energy_ball))
+ return
+ ..()
+
/obj/singularity/energy_ball/process()
if(!orbiting)
handle_energy()
@@ -117,7 +127,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
/obj/singularity/energy_ball/proc/new_mini_ball()
if(!loc)
return
- var/obj/singularity/energy_ball/EB = new(loc)
+ var/obj/singularity/energy_ball/EB = new(loc, 0, TRUE)
EB.transform *= pick(0.3, 0.4, 0.5, 0.6, 0.7)
var/icon/I = icon(icon,icon_state,dir)
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index a6440e32ed..b1fd49779f 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -191,7 +191,7 @@
fire_sound = 'sound/magic/lightningbolt.ogg'
e_cost = 200
select_name = "stun"
- projectile_type = /obj/item/projectile/energy/tesla_revolver
+ projectile_type = /obj/item/projectile/energy/tesla/revolver
/obj/item/ammo_casing/energy/gravityrepulse
projectile_type = /obj/item/projectile/gravityrepulse
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index dceed5b438..9835b1df21 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -179,6 +179,8 @@
return
if(setAngle)
Angle = setAngle
+ var/old_pixel_x = pixel_x
+ var/old_pixel_y = pixel_y
if(!legacy) //new projectiles
set waitfor = 0
var/next_run = world.time
@@ -201,29 +203,30 @@
var/Pixel_x=round((sin(Angle)+16*sin(Angle)*2), 1) //round() is a floor operation when only one argument is supplied, we don't want that here
var/Pixel_y=round((cos(Angle)+16*cos(Angle)*2), 1)
- var/pixel_x_offset = pixel_x + Pixel_x
- var/pixel_y_offset = pixel_y + Pixel_y
+ var/pixel_x_offset = old_pixel_x + Pixel_x
+ var/pixel_y_offset = old_pixel_y + Pixel_y
var/new_x = x
var/new_y = y
while(pixel_x_offset > 16)
pixel_x_offset -= 32
- pixel_x -= 32
+ old_pixel_x -= 32
new_x++// x++
while(pixel_x_offset < -16)
pixel_x_offset += 32
- pixel_x += 32
+ old_pixel_x += 32
new_x--
-
while(pixel_y_offset > 16)
pixel_y_offset -= 32
- pixel_y -= 32
+ old_pixel_y -= 32
new_y++
while(pixel_y_offset < -16)
pixel_y_offset += 32
- pixel_y += 32
+ old_pixel_y += 32
new_y--
-
+
+ pixel_x = old_pixel_x
+ pixel_y = old_pixel_y
step_towards(src, locate(new_x, new_y, z))
next_run += max(world.tick_lag, speed)
var/delay = next_run - world.time
@@ -232,7 +235,9 @@
pixel_y = pixel_y_offset
else
animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW)
-
+ old_pixel_x = pixel_x_offset
+ old_pixel_y = pixel_y_offset
+
if(original && (original.layer>=2.75) || ismob(original))
if(loc == get_turf(original))
if(!(original in permutated))
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index c1a67f4c81..974ea935f2 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -159,44 +159,34 @@
/obj/item/projectile/energy/bolt/large
damage = 20
-/obj/item/projectile/energy/tesla_revolver
+/obj/item/projectile/energy/tesla
name = "tesla bolt"
icon_state = "tesla_projectile"
impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
var/chain
-/obj/item/projectile/energy/tesla_revolver/fire(setAngle)
+/obj/item/projectile/energy/tesla/fire(setAngle)
if(firer)
chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
..()
-/obj/item/projectile/energy/tesla_revolver/on_hit(atom/target)
- . = ..()
- if(isliving(target))
- tesla_zap(src, 3, 10000)
- qdel(src)
-
-/obj/item/projectile/energy/tesla_revolver/Destroy()
+/obj/item/projectile/energy/tesla/Destroy()
qdel(chain)
return ..()
+/obj/item/projectile/energy/tesla/revolver
+ name = "energy orb"
-/obj/item/projectile/energy/tesla_cannon
- name = "tesla bolt"
- icon_state = "tesla_projectile"
- impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
- var/chain
+/obj/item/projectile/energy/tesla/revolver/on_hit(atom/target)
+ . = ..()
+ if(isliving(target))
+ tesla_zap(target, 3, 10000)
+ qdel(src)
-/obj/item/projectile/energy/tesla_cannon/fire(setAngle)
- if(firer)
- chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
- ..()
+/obj/item/projectile/energy/tesla/cannon
+ name = "tesla orb"
-/obj/item/projectile/energy/tesla_cannon/on_hit(atom/target)
+/obj/item/projectile/energy/tesla/cannon/on_hit(atom/target)
. = ..()
- tesla_zap(src, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
+ tesla_zap(target, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
qdel(src)
-
-/obj/item/projectile/energy/tesla_cannon/Destroy()
- qdel(chain)
- return ..()
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 2dbc0ff1c2..a8ab8fd426 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -38,7 +38,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/rice = list("rice" = -5),
- /obj/item/weapon/reagent_containers/food/snacks/donut/New = list("sprinkles" = -2, "sugar" = 1),
+ /obj/item/weapon/reagent_containers/food/snacks/donut = list("sprinkles" = -2, "sugar" = 1),
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/egg = list("eggyolk" = -5),
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 23836e866d..31ec27fb79 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -966,7 +966,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Only for the experienced. You think you see sand floating in the glass."
/datum/reagent/consumable/ethanol/bananahonk
- name = "Banana Mama"
+ name = "Banana Honk"
id = "bananahonk"
description = "A drink from Clown Heaven."
nutriment_factor = 1 * REAGENTS_METABOLISM
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 442772fea8..56a89fe389 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -60,7 +60,10 @@
// data for nutriment is one or more (flavour -> ratio)
// where all the ratio values adds up to 1
- var/list/taste_amounts = data.Copy()
+ var/list/taste_amounts = list()
+ if(data)
+ taste_amounts = data.Copy()
+
counterlist_scale(taste_amounts, volume)
var/list/other_taste_amounts = newdata.Copy()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 500147d233..6d38e85ca8 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -347,10 +347,9 @@
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
if(method in list(INGEST, VAPOR, INJECT))
- M.Stun(4)
- M.Weaken(4)
+ M.nutrition -= 5
if(show_message)
- to_chat(M, "Your stomach agonizingly cramps!")
+ to_chat(M, "Your stomach feels empty and cramps!")
else
var/mob/living/carbon/C = M
for(var/s in C.surgeries)
@@ -962,8 +961,7 @@
/datum/reagent/medicine/antitoxin/on_mob_life(mob/living/M)
M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
- if(R != src)
- M.reagents.remove_reagent(R.id,1)
+ M.reagents.remove_reagent(R.id,1)
..()
. = 1
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index c25a1d050d..ac259e58c2 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -189,7 +189,7 @@
/datum/reagent/water/holywater/on_mob_life(mob/living/M)
if(!data) data = 1
data++
- M.jitteriness = max(M.jitteriness-5,0)
+ M.jitteriness = min(M.jitteriness+4,10)
if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
if(!M.stuttering)
M.stuttering = 1
@@ -212,9 +212,9 @@
SSticker.mode.remove_cultist(M.mind, 1, 1)
else if(is_servant_of_ratvar(M))
remove_servant_of_ratvar(M)
- holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
M.jitteriness = 0
M.stuttering = 0
+ holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
return
holder.remove_reagent(id, 0.4) //fixed consumption to prevent balancing going out of whack
@@ -658,7 +658,7 @@
taste_mult = 0 // apparently tasteless.
/datum/reagent/mercury/on_mob_life(mob/living/M)
- if(M.canmove && isspaceturf(M.loc))
+ if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinal))
if(prob(5))
M.emote(pick("twitch","drool","moan"))
@@ -738,7 +738,7 @@
taste_description = "metal"
/datum/reagent/lithium/on_mob_life(mob/living/M)
- if(M.canmove && isspaceturf(M.loc))
+ if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinal))
if(prob(5))
M.emote(pick("twitch","drool","moan"))
@@ -1568,6 +1568,13 @@
M.update_transform()
..()
+/datum/reagent/plastic_polymers
+ name = "plastic polymers"
+ id = "plastic_polymers"
+ description = "the petroleum based components of plastic."
+ color = "#f7eded"
+ taste_description = "plastic"
+
/datum/reagent/glitter
name = "generic glitter"
id = "glitter"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 528124f84c..cedec9941b 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -648,6 +648,34 @@
M.losebreath += 5
return ..()
+/datum/reagent/toxin/spewium
+ name = "Spewium"
+ id = "spewium"
+ description = "A powerful emetic, causes uncontrollable vomiting. May result in vomiting organs at high doses."
+ reagent_state = LIQUID
+ color = "#2f6617" //A sickly green color
+ metabolization_rate = REAGENTS_METABOLISM
+ overdose_threshold = 29
+ toxpwr = 0
+ taste_description = "vomit"
+
+/datum/reagent/toxin/spewium/on_mob_life(mob/living/M)
+ .=..()
+ if(current_cycle >=11 && prob(min(50,current_cycle)) && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.vomit(lost_nutrition = 10, blood = prob(10), stun = prob(50), distance = rand(0,4), message = TRUE, toxic = prob(30))
+ for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
+ if(R != src)
+ H.reagents.remove_reagent(R.id,1)
+
+/datum/reagent/toxin/spewium/overdose_process(mob/living/M)
+ . = ..()
+ if(current_cycle >=33 && prob(15) && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.spew_organ()
+ H.vomit(lost_nutrition = 0, blood = 1, stun = 1, distance = 4)
+ to_chat(H, "You feel something lumpy come up as you vomit.")
+
/datum/reagent/toxin/curare
name = "Curare"
id = "curare"
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index 19bb28666d..0bc843a605 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -624,3 +624,14 @@
id = "laughter"
results = list("laughter" = 10) // Fuck it. I'm not touching this one.
required_reagents = list("sugar" = 1, "banana" = 1)
+
+/datum/chemical_reaction/plastic_polymers
+ name = "plastic polymers"
+ id = "plastic_polymers"
+ required_reagents = list("oil" = 5, "sodiumchloride" = 2, "ash" = 3)
+ required_temp = 374 //lazily consistent with soap & other crafted objects generically created with heat.
+
+/datum/chemical_reaction/plastic_polymers/on_reaction(datum/reagents/holder, created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/i in 1 to 10)
+ new /obj/item/stack/sheet/plastic(location)
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index a92c52abf4..37074b6d12 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -58,6 +58,12 @@
icon_state = "bottle12"
list_reagents = list("cyanide" = 30)
+/obj/item/weapon/reagent_containers/glass/bottle/spewium
+ name = "spewium bottle"
+ desc = "A small bottle of spewium."
+ icon_state = "bottle12"
+ list_reagents = list("spewium" = 30)
+
/obj/item/weapon/reagent_containers/glass/bottle/morphine
name = "morphine bottle"
desc = "A small bottle of morphine."
diff --git a/code/modules/shuttle/elevator.dm b/code/modules/shuttle/elevator.dm
new file mode 100644
index 0000000000..12f9c24f9a
--- /dev/null
+++ b/code/modules/shuttle/elevator.dm
@@ -0,0 +1,10 @@
+/obj/docking_port/mobile/elevator
+ name = "elevator"
+ id = "elevator"
+ dwidth = 3
+ width = 7
+ height = 7
+ knockdown = FALSE
+
+/obj/docking_port/mobile/elevator/request(obj/docking_port/stationary/S) //No transit, no ignition, just a simple up/down platform
+ dock(S, TRUE)
\ No newline at end of file
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 756fad25b3..b5571164ff 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -3,7 +3,7 @@
return
// Called when shuttle attempts to move an atom.
-/atom/movable/proc/onShuttleMove(turf/T1, rotation)
+/atom/movable/proc/onShuttleMove(turf/T1, rotation, knockdown = TRUE)
if(rotation)
shuttleRotate(rotation)
loc = T1
@@ -47,11 +47,11 @@
else
shake_camera(src, 7, 1)
-/mob/living/carbon/onShuttleMove()
+/mob/living/carbon/onShuttleMove(turf/T1, rotation, knockdown = TRUE)
. = ..()
if(!.)
return
- if(!buckled)
+ if(!buckled && knockdown)
Weaken(3)
/obj/effect/abstract/proximity_checker/onShuttleMove()
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 00ddecb7f8..656ba24da6 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -217,6 +217,8 @@
var/launch_status = NOLAUNCH
+ var/knockdown = TRUE //Will it knock down mobs when it docks?
+
// A timid shuttle will not register itself with the shuttle subsystem
// All shuttle templates are timid
var/timid = FALSE
@@ -517,7 +519,7 @@
//move mobile to new location
for(var/atom/movable/AM in T0)
- if(AM.onShuttleMove(T1, rotation))
+ if(AM.onShuttleMove(T1, rotation, knockdown))
moved_atoms += AM
if(rotation)
@@ -578,10 +580,7 @@
if(M.pulledby)
M.pulledby.stop_pulling()
M.stop_pulling()
- M.visible_message("[M] is hit by \
- a hyperspace ripple!",
- "You feel an immense \
- crushing pressure as the space around you ripples.")
+ M.visible_message("[src] slams into [M]!")
if(M.key || M.get_ghost(TRUE))
SSblackbox.add_details("shuttle_gib", "[type]")
else
diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm
index 7ebafe6e24..052c1f1162 100644
--- a/code/modules/spells/spell_types/mind_transfer.dm
+++ b/code/modules/spells/spell_types/mind_transfer.dm
@@ -62,29 +62,14 @@ Also, you never added distance checking after target is selected. I've went ahea
var/mob/caster = user//The wizard/whomever doing the body transferring.
//MIND TRANSFER BEGIN
- if(caster.mind.special_verbs.len)//If the caster had any special verbs, remove them from the mob verb list.
- for(var/V in caster.mind.special_verbs)//Since the caster is using an object spell system, this is mostly moot.
- caster.verbs -= V//But a safety nontheless.
-
- if(victim.mind.special_verbs.len)//Now remove all of the victim's verbs.
- for(var/V in victim.mind.special_verbs)
- victim.verbs -= V
-
var/mob/dead/observer/ghost = victim.ghostize(0)
caster.mind.transfer_to(victim)
- if(victim.mind.special_verbs.len)//To add all the special verbs for the original caster.
- for(var/V in caster.mind.special_verbs)//Not too important but could come into play.
- caster.verbs += V
-
ghost.mind.transfer_to(caster)
if(ghost.key)
caster.key = ghost.key //have to transfer the key since the mind was not active
qdel(ghost)
- if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here.
- for(var/V in caster.mind.special_verbs)
- caster.verbs += V
//MIND TRANSFER END
//Here we paralyze both mobs and knock them out for a time.
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index de8c2b79ac..60edac1977 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -218,6 +218,14 @@
for(var/X in list(owner.glasses, owner.ears, owner.wear_mask, owner.head))
var/obj/item/I = X
owner.dropItemToGround(I, TRUE)
+
+ //Handle dental implants
+ for(var/datum/action/item_action/hands_free/activate_pill/AP in owner.actions)
+ AP.Remove(owner)
+ var/obj/pill = AP.target
+ if(pill)
+ pill.forceMove(src)
+
name = "[owner.real_name]'s head"
..()
@@ -300,6 +308,14 @@
C.real_name = real_name
real_name = ""
name = initial(name)
+
+ //Handle dental implants
+ for(var/obj/item/weapon/reagent_containers/pill/P in src)
+ for(var/datum/action/item_action/hands_free/activate_pill/AP in P.actions)
+ P.forceMove(C)
+ AP.Grant(C)
+ break
+
..()
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 909f83e4d7..dd63506086 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -48,7 +48,10 @@
brain = null
update_icon_dropped()
else
- I.loc = T
+ if(istype(I, /obj/item/weapon/reagent_containers/pill))
+ for(var/datum/action/item_action/hands_free/activate_pill/AP in I.actions)
+ qdel(AP)
+ I.forceMove(T)
/obj/item/bodypart/head/update_limb(dropping_limb, mob/living/carbon/source)
var/mob/living/carbon/C
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index eef88e4a5f..c51a49081c 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -18,10 +18,10 @@
user.drop_item()
tool.loc = target
- var/datum/action/item_action/hands_free/activate_pill/P = new
+ var/datum/action/item_action/hands_free/activate_pill/P = new(tool)
P.button.name = "Activate [tool.name]"
P.target = tool
- P.Grant(target)
+ P.Grant(target) //The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it
user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].")
return 1
@@ -37,6 +37,5 @@
if(target.reagents.total_volume)
target.reagents.reaction(owner, INGEST)
target.reagents.trans_to(owner, target.reagents.total_volume)
- Remove(owner)
qdel(target)
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index c91cb219af..e66346a2c8 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -4,6 +4,7 @@
desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible."
zone = "head"
slot = "ears"
+ gender = PLURAL
// `deaf` measures "ticks" of deafness. While > 0, the person is unable
// to hear anything.
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 672ac924ad..2cb2dd5dc6 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -4,6 +4,7 @@
desc = "I see you!"
zone = "eyes"
slot = "eye_sight"
+ gender = PLURAL
var/sight_flags = 0
var/see_in_dark = 2
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index b310f891fb..50f66fef27 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -8,6 +8,7 @@
icon_state = "appendix"
zone = "mouth"
slot = "vocal_cords"
+ gender = PLURAL
var/list/spans = null
/obj/item/organ/vocal_cords/proc/can_speak_with() //if there is any limitation to speaking with these cords
diff --git a/code/world.dm b/code/world.dm
index 9023ac47f3..29c40a5742 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -136,11 +136,7 @@
if(!key_valid)
return "Bad Key"
else
-#define CHAT_PULLR 64 //defined in preferences.dm, but not available here at compilation time
- for(var/client/C in GLOB.clients)
- if(C.prefs && (C.prefs.chat_toggles & CHAT_PULLR))
- to_chat(C, "PR: [input["announce"]]")
-#undef CHAT_PULLR
+ AnnouncePR(input["announce"], json_decode(input["payload"]))
else if("crossmessage" in input)
if(!key_valid)
@@ -176,6 +172,25 @@
else if("server_hop" in input)
show_server_hop_transfer_screen(input["server_hop"])
+#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
+ //This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
+
+/world/proc/AnnouncePR(announcement, list/payload)
+ var/static/list/PRcounts = list() //PR id -> number of times announced this round
+ var/id = "[payload["pull_request"]["id"]]"
+ if(!PRcounts[id])
+ PRcounts[id] = 1
+ else
+ ++PRcounts[id]
+ if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND)
+ return
+
+#define CHAT_PULLR 64 //defined in preferences.dm, but not available here at compilation time
+ for(var/client/C in GLOB.clients)
+ if(C.prefs && (C.prefs.chat_toggles & CHAT_PULLR))
+ C << "PR: [announcement]"
+#undef CHAT_PULLR
+
#define WORLD_REBOOT(X) log_world("World rebooted at [time_stamp()]"); ..(X); return;
/world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time)
if (reason == 1) //special reboot, do none of the normal stuff
@@ -226,7 +241,7 @@
/world/proc/RoundEndAnimation(round_end_sound_sent)
set waitfor = FALSE
var/round_end_sound
- if(!SSticker && SSticker.round_end_sound)
+ if(SSticker.round_end_sound)
round_end_sound = SSticker.round_end_sound
if (!round_end_sound_sent)
for(var/thing in GLOB.clients)
diff --git a/html/changelogs/AutoChangeLog-pr-676.yml b/html/changelogs/AutoChangeLog-pr-676.yml
new file mode 100644
index 0000000000..73c6fac766
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-676.yml
@@ -0,0 +1,5 @@
+author: "Joan"
+delete-after: True
+changes:
+ - rscadd: "Proselytizers can now charge from Sigils of Transmission at a rate of 1000W per second."
+ - rscadd: "Sigils of Transmission can be charged with brass at a rate of 250W per sheet."
diff --git a/html/changelogs/AutoChangeLog-pr-682.yml b/html/changelogs/AutoChangeLog-pr-682.yml
new file mode 100644
index 0000000000..c55c645e6e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-682.yml
@@ -0,0 +1,4 @@
+author: "Swindly"
+delete-after: True
+changes:
+ - tweak: "Mercury and Lithium make people move when not in space instead of when in space."
diff --git a/html/changelogs/AutoChangeLog-pr-698.yml b/html/changelogs/AutoChangeLog-pr-698.yml
new file mode 100644
index 0000000000..40e55644b5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-698.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "You can now make holocalls! Simply stand on a pad, bring up the menu, and select the holopad you wish to call. Remain still until someone answers. When they do, you'll be able to act just like an AI hologram until the call ends"
diff --git a/html/changelogs/AutoChangeLog-pr-701.yml b/html/changelogs/AutoChangeLog-pr-701.yml
new file mode 100644
index 0000000000..8848bcb450
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-701.yml
@@ -0,0 +1,7 @@
+author: "ninjanomnom"
+delete-after: True
+changes:
+ - tweak: "TEG displays power in kw or MW now"
+ - tweak: "TEG power bar only maxes over 1MW now"
+ - experiment: "Moves TEG to SSair"
+ - experiment: "Moves SM to SSair"
diff --git a/html/changelogs/AutoChangeLog-pr-706.yml b/html/changelogs/AutoChangeLog-pr-706.yml
new file mode 100644
index 0000000000..bef4ff2c24
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-706.yml
@@ -0,0 +1,4 @@
+author: "Kor, Goof and Plizzard"
+delete-after: True
+changes:
+ - rscadd: "Adds persistent trophy cases. They are not on any map yet."
diff --git a/html/changelogs/AutoChangeLog-pr-708.yml b/html/changelogs/AutoChangeLog-pr-708.yml
new file mode 100644
index 0000000000..6cb7c07312
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-708.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Squishy plants will now affect walls and other turfs they get squished on"
diff --git a/html/changelogs/AutoChangeLog-pr-714.yml b/html/changelogs/AutoChangeLog-pr-714.yml
new file mode 100644
index 0000000000..d5e4582f40
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-714.yml
@@ -0,0 +1,4 @@
+author: "XDTM"
+delete-after: True
+changes:
+ - tweak: "Blood Cult's talisman of Horrors now works at range. It will still give no warning to the victim."
diff --git a/html/changelogs/AutoChangeLog-pr-717.yml b/html/changelogs/AutoChangeLog-pr-717.yml
new file mode 100644
index 0000000000..fbb98e0039
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-717.yml
@@ -0,0 +1,5 @@
+author: "coiax"
+delete-after: True
+changes:
+ - rscadd: "When talking on the alien hivemind, a person will be identified by
+their real name, rather than who they are disguised as."
diff --git a/html/changelogs/AutoChangeLog-pr-727.yml b/html/changelogs/AutoChangeLog-pr-727.yml
new file mode 100644
index 0000000000..2eaec0638a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-727.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - tweak: "Fixed the slimecore HUD's neck slot sprite."
diff --git a/html/changelogs/AutoChangeLog-pr-733.yml b/html/changelogs/AutoChangeLog-pr-733.yml
new file mode 100644
index 0000000000..ef779f70a1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-733.yml
@@ -0,0 +1,4 @@
+author: "BeeSting12"
+delete-after: True
+changes:
+ - bugfix: "Omega shuttle now has lighting."
diff --git a/html/changelogs/AutoChangeLog-pr-745.yml b/html/changelogs/AutoChangeLog-pr-745.yml
new file mode 100644
index 0000000000..b9aa3fddd2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-745.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "revenants now properly resurrect from ectoplasm, as opposed to ectoplasm merely spawning a new grief ghost"
diff --git a/html/changelogs/AutoChangeLog-pr-746.yml b/html/changelogs/AutoChangeLog-pr-746.yml
new file mode 100644
index 0000000000..ddeea1d732
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-746.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Turrets can no longer see invisible things, such as unrevealed revenants"
diff --git a/html/changelogs/AutoChangeLog-pr-747.yml b/html/changelogs/AutoChangeLog-pr-747.yml
new file mode 100644
index 0000000000..583f6b5e56
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-747.yml
@@ -0,0 +1,4 @@
+author: "QualityVan"
+delete-after: True
+changes:
+ - rscadd: "Point flashlights at mouths to see what's inside them"
diff --git a/html/changelogs/AutoChangeLog-pr-748.yml b/html/changelogs/AutoChangeLog-pr-748.yml
new file mode 100644
index 0000000000..7ad62adec8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-748.yml
@@ -0,0 +1,5 @@
+author: "Moonlighting Mac says"
+delete-after: True
+changes:
+ - rscadd: "Courtesy of the art & crafts division, imitation basalt tiles themed on the rough volcanic terrain of lavaland are now available to be made out of sandstone."
+ - experiment: "The manufacturer even managed to replicate the way that it lights up with volcanic energy, it is the perfect accompaniment to other fake (or real) lava-land tiles or a independent piece."
diff --git a/html/changelogs/AutoChangeLog-pr-756.yml b/html/changelogs/AutoChangeLog-pr-756.yml
new file mode 100644
index 0000000000..7ef015b31c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-756.yml
@@ -0,0 +1,6 @@
+author: "lordpidey"
+delete-after: True
+changes:
+ - rscadd: "There is a new traitor poison, spewium. It will cause uncontrollable vomiting, which gets worse the longer it's in your system. An overdose can cause vomiting of organs."
+ - tweak: "Committing suicide with a gas pump can now shoot out random organs."
+ - bugfix: "Toxic vomit now shows up as intended."
diff --git a/html/changelogs/AutoChangeLog-pr-760.yml b/html/changelogs/AutoChangeLog-pr-760.yml
new file mode 100644
index 0000000000..b0296b2330
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-760.yml
@@ -0,0 +1,4 @@
+author: "bgobandit"
+delete-after: True
+changes:
+ - tweak: "The Syndicate has added basic functionality to their state-of-the-art equipment. Nuke ops can now donate all TCs at once."
diff --git a/html/changelogs/AutoChangeLog-pr-764.yml b/html/changelogs/AutoChangeLog-pr-764.yml
new file mode 100644
index 0000000000..87210fcb7a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-764.yml
@@ -0,0 +1,4 @@
+author: "QualityVan"
+delete-after: True
+changes:
+ - bugfix: "Dental implants stay with the head they're in"
diff --git a/html/changelogs/AutoChangeLog-pr-771.yml b/html/changelogs/AutoChangeLog-pr-771.yml
new file mode 100644
index 0000000000..031ec64151
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-771.yml
@@ -0,0 +1,4 @@
+author: "BeeSting12"
+delete-after: True
+changes:
+ - bugfix: "Pubbystation no longer has two airlocks stacked on top of each other leading into xenobiology's kill room."
diff --git a/html/changelogs/AutoChangeLog-pr-781.yml b/html/changelogs/AutoChangeLog-pr-781.yml
new file mode 100644
index 0000000000..08a5c148ff
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-781.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "Teslas now give off light"
diff --git a/html/changelogs/AutoChangeLog-pr-792.yml b/html/changelogs/AutoChangeLog-pr-792.yml
new file mode 100644
index 0000000000..9d2ccfebde
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-792.yml
@@ -0,0 +1,6 @@
+author: "BeeSting12"
+delete-after: True
+changes:
+ - rscadd: "Deltastation's chemistry now has a screwdriver."
+ - bugfix: "Deltastation's morgue no longer has a blue tile."
+ - bugfix: "Deltastation's chemistry smart fridge is no longer blocked by a disposal unit."
diff --git a/html/changelogs/AutoChangeLog-pr-800.yml b/html/changelogs/AutoChangeLog-pr-800.yml
new file mode 100644
index 0000000000..798c98c64b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-800.yml
@@ -0,0 +1,4 @@
+author: "coiax"
+delete-after: True
+changes:
+ - tweak: "The lavaland Seed Vault ruin can spawn only once."
diff --git a/html/changelogs/AutoChangeLog-pr-801.yml b/html/changelogs/AutoChangeLog-pr-801.yml
new file mode 100644
index 0000000000..756cf33927
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-801.yml
@@ -0,0 +1,6 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Internal Affairs Agents now obtain the kill objectives of their targets when they die."
+ - rscadd: "Internal Affairs Agents now have an integrated nanotrasen pinpointer that tracks their target at distances further than ten squares."
+ - rscadd: "Internal Affairs Agents will now lose any restrictions on collateral damage and gain a \"Die a glorious death\" objective upon becoming the last man standing, and revert if any of their targets are cloned."
diff --git a/html/changelogs/AutoChangeLog-pr-805.yml b/html/changelogs/AutoChangeLog-pr-805.yml
new file mode 100644
index 0000000000..be4a17ddf7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-805.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Reduction to nutrition when consuming Miner's salve."
+ - rscdel: "Stun/weaken that bypasses bugged chemical protection when consuming Miner's salve."
diff --git a/html/changelogs/AutoChangeLog-pr-809.yml b/html/changelogs/AutoChangeLog-pr-809.yml
new file mode 100644
index 0000000000..06fb6139cc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-809.yml
@@ -0,0 +1,5 @@
+author: "QualityVan"
+delete-after: True
+changes:
+ - rscadd: "Cargo can order restocking units for NanoMed vending machines"
+ - rscadd: "NanoMed vending machines can be build and unbuilt"
diff --git a/html/changelogs/AutoChangeLog-pr-815.yml b/html/changelogs/AutoChangeLog-pr-815.yml
new file mode 100644
index 0000000000..6472c7a13d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-815.yml
@@ -0,0 +1,4 @@
+author: "Penguaro"
+delete-after: True
+changes:
+ - bugfix: "Adjusted the Examine description of the right-most tiles of the Space Station 13 sign to be consistent with the rest of the tiles."
diff --git a/html/changelogs/AutoChangeLog-pr-824.yml b/html/changelogs/AutoChangeLog-pr-824.yml
new file mode 100644
index 0000000000..625034ab7c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-824.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Showers and sinks added to gulag and mining station for hygiene and fire safety."
+ - rscadd: "Watertanks added to mining station for convenient fire extinguisher refill."
diff --git a/html/changelogs/AutoChangeLog-pr-825.yml b/html/changelogs/AutoChangeLog-pr-825.yml
new file mode 100644
index 0000000000..ee3a963c30
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-825.yml
@@ -0,0 +1,4 @@
+author: "Robustin"
+delete-after: True
+changes:
+ - tweak: "c4 planting is now 40% faster"
diff --git a/html/changelogs/AutoChangeLog-pr-827.yml b/html/changelogs/AutoChangeLog-pr-827.yml
new file mode 100644
index 0000000000..e16167448d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-827.yml
@@ -0,0 +1,4 @@
+author: "Jay"
+delete-after: True
+changes:
+ - rscadd: "Adds finger snapping emote. Use say *snap"
diff --git a/html/changelogs/AutoChangeLog-pr-829.yml b/html/changelogs/AutoChangeLog-pr-829.yml
new file mode 100644
index 0000000000..619bc85876
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-829.yml
@@ -0,0 +1,4 @@
+author: "Penguaro"
+delete-after: True
+changes:
+ - bugfix: "Anywhere there was lava below a tile on the station is now space."
diff --git a/html/changelogs/AutoChangeLog-pr-841.yml b/html/changelogs/AutoChangeLog-pr-841.yml
new file mode 100644
index 0000000000..3c27ac83c8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-841.yml
@@ -0,0 +1,5 @@
+author: "Moonlighting Mac"
+delete-after: True
+changes:
+ - experiment: "Due to budget cuts and oil synthesis replacing expensive processes of digging up haunted primeval ashwalker burial grounds, Nanotransen has taught chemists how to make plastic from chemicals in the hopes that new plastic products can reduce expenditure on metal and glass."
+ - rscadd: "you can now make plastic sheets from chemistry out of heated up crude oil, ash & sodium chloride"
diff --git a/icons/effects/clockwork_effects.dmi b/icons/effects/clockwork_effects.dmi
index 8bbf24a7ef..b2e15da1d0 100644
Binary files a/icons/effects/clockwork_effects.dmi and b/icons/effects/clockwork_effects.dmi differ
diff --git a/icons/mob/jungle/arachnid.dmi b/icons/mob/jungle/arachnid.dmi
new file mode 100644
index 0000000000..a1db8e351f
Binary files /dev/null and b/icons/mob/jungle/arachnid.dmi differ
diff --git a/icons/mob/screen_slimecore.dmi b/icons/mob/screen_slimecore.dmi
index bc33ad6e37..63d67e6fba 100644
Binary files a/icons/mob/screen_slimecore.dmi and b/icons/mob/screen_slimecore.dmi differ
diff --git a/icons/obj/flora/jungletrees.dmi b/icons/obj/flora/jungletrees.dmi
index 461ac0b265..67c7e0f463 100644
Binary files a/icons/obj/flora/jungletrees.dmi and b/icons/obj/flora/jungletrees.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index fe4c07362a..c6df0a2603 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index d629cfe24d..5a8afeee51 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
index aa9f2873f0..eac7b8a266 100644
Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index a1cd8fb2f9..28bc9e28d3 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/floors/junglechasm.dmi b/icons/turf/floors/junglechasm.dmi
new file mode 100644
index 0000000000..699a3b667c
Binary files /dev/null and b/icons/turf/floors/junglechasm.dmi differ
diff --git a/sound/effects/snap01.ogg b/sound/effects/snap01.ogg
new file mode 100644
index 0000000000..aa7ab9f5bf
Binary files /dev/null and b/sound/effects/snap01.ogg differ
diff --git a/config/admin_nicknames.txt b/strings/admin_nicknames.txt
similarity index 100%
rename from config/admin_nicknames.txt
rename to strings/admin_nicknames.txt
diff --git a/config/sillytips.txt b/strings/sillytips.txt
similarity index 100%
rename from config/sillytips.txt
rename to strings/sillytips.txt
diff --git a/config/tips.txt b/strings/tips.txt
similarity index 100%
rename from config/tips.txt
rename to strings/tips.txt
diff --git a/tgstation.dme b/tgstation.dme
index 1f3ef27802..543fb04f6c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -244,6 +244,7 @@
#include "code\datums\dog_fashion.dm"
#include "code\datums\emotes.dm"
#include "code\datums\forced_movement.dm"
+#include "code\datums\holocall.dm"
#include "code\datums\hud.dm"
#include "code\datums\map_config.dm"
#include "code\datums\martial.dm"
@@ -1714,6 +1715,7 @@
#include "code\modules\mob\living\simple_animal\hostile\hivebot.dm"
#include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
#include "code\modules\mob\living\simple_animal\hostile\illusion.dm"
+#include "code\modules\mob\living\simple_animal\hostile\jungle_mobs.dm"
#include "code\modules\mob\living\simple_animal\hostile\killertomato.dm"
#include "code\modules\mob\living\simple_animal\hostile\mecha_pilot.dm"
#include "code\modules\mob\living\simple_animal\hostile\mimic.dm"
@@ -2012,6 +2014,7 @@
#include "code\modules\shuttle\arrivals.dm"
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\computer.dm"
+#include "code\modules\shuttle\elevator.dm"
#include "code\modules\shuttle\emergency.dm"
#include "code\modules\shuttle\ferry.dm"
#include "code\modules\shuttle\manipulator.dm"