diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 966f8080edd8..a95cb5b9546a 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -89189,6 +89189,18 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/patients_rooms) +"rnW" = ( +/obj/docking_port/stationary{ + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + name = "northwest of station"; + shuttle_id = "syndicate_nw"; + width = 23 + }, +/turf/open/space/openspace, +/area/space) "rnY" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, @@ -201454,7 +201466,7 @@ ulx ulx ulx ulx -ulx +rnW ulx ulx ulx diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index e62c1eac7c5b..5aef1da1eefd 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -118,7 +118,7 @@ Difficulty: Medium new /obj/effect/temp_visual/dir_setting/miner_death(loc, dir) /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Move(atom/newloc) - if(newloc && newloc.z == z && (islava(newloc) || ischasm(newloc))) //we're not stupid! + if(newloc && newloc.z == z && ischasm(newloc)) //we're not stupid! 2025: We were, a bit. return FALSE return ..() diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b170a7a26db2..cefbe9ff5f27 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -133,8 +133,8 @@ /obj/projectile/beam/disabler/smoothbore/prime name = "focused disabler beam" weak_against_armour = FALSE - stamina = 35 - debilitate_mult = 3.5 + stamina = 65 // MONKESTATION EDIT ORG: 30 + debilitate_mult = 3.5 // MONKESTATION ADDITION /obj/projectile/beam/pulse name = "pulse" diff --git a/monkestation/code/datums/quirks/negative_quirks/insanity.dm b/monkestation/code/datums/quirks/negative_quirks/insanity.dm new file mode 100644 index 000000000000..7620a317a160 --- /dev/null +++ b/monkestation/code/datums/quirks/negative_quirks/insanity.dm @@ -0,0 +1,18 @@ +//IPC PUNISHMENT SYSTEM// +/datum/quirk/insanity/add() + if(!isipc(quirk_holder)) // this checks ishuman too + return + var/mob/living/carbon/human/ipc_holder = quirk_holder + ipc_holder.physiology?.brute_mod *= 1.3 + ipc_holder.physiology?.burn_mod *= 1.3 + +/datum/quirk/insanity/remove() + if(!isipc(quirk_holder)) // this checks ishuman too + return + var/mob/living/carbon/human/ipc_holder = quirk_holder + ipc_holder.physiology?.brute_mod /= 1.3 + ipc_holder.physiology?.burn_mod /= 1.3 + +/datum/quirk/insanity/post_add() + if(isipc(quirk_holder)) + to_chat(quirk_holder, span_boldnotice("Your chassis feels frail.")) diff --git a/monkestation/code/game/objects/items/guns/crank_guns.dm b/monkestation/code/game/objects/items/guns/crank_guns.dm index 93f942bdb870..02332580e455 100644 --- a/monkestation/code/game/objects/items/guns/crank_guns.dm +++ b/monkestation/code/game/objects/items/guns/crank_guns.dm @@ -21,17 +21,6 @@ charge_sound_cooldown_time = 1.3 SECONDS, \ ) -/obj/projectile/beam/laser/musket - damage = 30 - stamina = 45 - -/obj/projectile/beam/laser/musket/prime - damage = 35 - stamina = 60 - -/obj/projectile/beam/disabler/smoothbore/prime /// ????????? why is this here *and* in beams ??????? - stamina = 65 - /obj/item/ammo_casing/energy/laser/musket fire_sound = 'sound/weapons/lasercannonfire.ogg' diff --git a/tgstation.dme b/tgstation.dme index 6eeb0ea78969..e74a9c41e824 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6003,6 +6003,7 @@ #include "monkestation\code\datums\quirks\negative_quirks\dnr.dm" #include "monkestation\code\datums\quirks\negative_quirks\feeble.dm" #include "monkestation\code\datums\quirks\negative_quirks\frail.dm" +#include "monkestation\code\datums\quirks\negative_quirks\insanity.dm" #include "monkestation\code\datums\quirks\negative_quirks\kleptomaniac.dm" #include "monkestation\code\datums\quirks\negative_quirks\light_drinker.dm" #include "monkestation\code\datums\quirks\negative_quirks\monophobia.dm"