Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes some duped code, RDS punishment, northwest blueshift, and BDM pathfinding #4992

Merged
merged 5 commits into from
Jan 20, 2025
Merged

Fixes some duped code, RDS punishment, northwest blueshift, and BDM pathfinding #4992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
085f1b8
two fixes
Jan 20, 2025
30e1c27
Merge branch 'Monkestation:master' into not-so-heroic-laser-musket
Shoddd Jan 20, 2025
453e21e
northwest of station
Jan 20, 2025
c03d4a1
Merge branch 'not-so-heroic-laser-musket' of https://github.com/Shodd…
Jan 20, 2025
8a6a273
punishment
Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -201454,7 +201466,7 @@ ulx
ulx
ulx
ulx
ulx
rnW
ulx
ulx
ulx
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/projectile/beams.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 18 additions & 0 deletions monkestation/code/datums/quirks/negative_quirks/insanity.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."))
11 changes: 0 additions & 11 deletions monkestation/code/game/objects/items/guns/crank_guns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading