Skip to content

Commit 49d9e24

Browse files
Bugfixesgalore (#5626)
## About The Pull Request Just a pile of bugfixes. Fixes #2758 Fixes #2788 Fixes #5605 Fixes #5632 Fixes #5637 Fixes #2165 Fixes #5621 Fixes #5633 Temp bandaid for pixelshift dancing exploit. Fixes to Blueshift. Secrets to find. There will be more as I work on them ## Why It's Good For The Game Bugfixes are always great ## Changelog :cl: fix: Plastic panels no longer allows for easy material duplication. fix: Scream for Me now works. It creates a number of severely bleeding wounds and pain. fix: Syndicate EMP kits now contain EMP grenades and the EMP implanter again. add: Added a reminder to the victim of a bloodsucker feeding, that they won't remember this happening. fix: No more pixelshift dancing exploits. fix: Memento Mori will now dust you if you would otherwise die as a bloodsucker. It does not appreciate being tricked. add: CMOs now get an autosurgeon for an NT 1.0 cyberlink in their locker so their medical hud implants will have full functionality once more. fix: Secrets on Blueshift add: Roosters added to ranching on Heliostation. fix: Unlocked the fridges in perma on Heliostation. /:cl:
1 parent 6c0700e commit 49d9e24

File tree

10 files changed

+104
-14
lines changed

10 files changed

+104
-14
lines changed

_maps/map_files/Blueshift/Blueshift.dmm

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59786,7 +59786,7 @@
5978659786
"lBQ" = (
5978759787
/obj/item/shard,
5978859788
/obj/effect/decal/cleanable/dirt,
59789-
/turf/open/floor/plating/airless,
59789+
/turf/open/misc/asteroid/snow/airless,
5979059790
/area/space/nearstation)
5979159791
"lBW" = (
5979259792
/obj/effect/spawner/structure/window/reinforced,
@@ -70911,6 +70911,8 @@
7091170911
/obj/structure/safe{
7091270912
name = "stinking safe"
7091370913
},
70914+
/obj/effect/spawner/random/sakhno,
70915+
/obj/effect/spawner/random/sakhno/ammo,
7091470916
/turf/open/floor/iron/cafeteria,
7091570917
/area/station/maintenance/department/medical/central)
7091670918
"nNt" = (
@@ -82681,6 +82683,16 @@
8268182683
/obj/structure/safe/floor{
8268282684
name = "frozen safe"
8268382685
},
82686+
/obj/item/reagent_containers/condiment/coldsauce,
82687+
/obj/item/temperature_pack/cold,
82688+
/obj/item/temperature_pack/cold,
82689+
/obj/item/temperature_pack/cold,
82690+
/obj/item/reagent_containers/condiment/coldsauce,
82691+
/obj/item/food/grown/icepepper,
82692+
/obj/item/clothing/head/costume/drfreezehat,
82693+
/obj/item/clothing/suit/costume/drfreeze_coat,
82694+
/obj/item/clothing/under/costume/drfreeze,
82695+
/obj/item/gun/energy/temperature/freeze,
8268482696
/turf/open/floor/plating/airless,
8268582697
/area/space/nearstation)
8268682698
"qaV" = (
@@ -83939,7 +83951,7 @@
8393983951
dir = 4
8394083952
},
8394183953
/obj/effect/decal/cleanable/dirt,
83942-
/turf/open/floor/plating/airless,
83954+
/turf/open/misc/asteroid/snow/airless,
8394383955
/area/space/nearstation)
8394483956
"qoE" = (
8394583957
/obj/effect/turf_decal/stripes{
@@ -99522,7 +99534,7 @@
9952299534
"tme" = (
9952399535
/obj/effect/decal/cleanable/glass,
9952499536
/obj/effect/mapping_helpers/broken_floor,
99525-
/turf/open/floor/plating/airless,
99537+
/turf/open/misc/asteroid/snow/airless,
9952699538
/area/space/nearstation)
9952799539
"tml" = (
9952899540
/obj/effect/turf_decal/tile/neutral{
@@ -124392,6 +124404,8 @@
124392124404
name = "gilded safe"
124393124405
},
124394124406
/obj/item/wheelchair/gold,
124407+
/obj/item/instrument/violin/golden,
124408+
/obj/item/food/grown/apple/gold,
124395124409
/turf/open/floor/iron/dark,
124396124410
/area/station/maintenance/department/security/prison_upper)
124397124411
"xZc" = (

_maps/map_files/Heliostation/Heliostation.dmm

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11764,6 +11764,9 @@
1176411764
"bfZ" = (
1176511765
/obj/structure/flora/bush/flowers_pp/style_random,
1176611766
/obj/machinery/airalarm/directional/north,
11767+
/mob/living/basic/chicken{
11768+
forced_gender = "male"
11769+
},
1176711770
/turf/open/floor/grass,
1176811771
/area/station/service/hydroponics/garden)
1176911772
"bgb" = (
@@ -12053,6 +12056,7 @@
1205312056
/area/station/service/hydroponics/garden)
1205412057
"bhh" = (
1205512058
/obj/structure/flora/bush/fullgrass/style_random,
12059+
/mob/living/basic/chicken/brown,
1205612060
/turf/open/floor/grass,
1205712061
/area/station/service/hydroponics/garden)
1205812062
"bhi" = (
@@ -12068,6 +12072,7 @@
1206812072
"bhk" = (
1206912073
/obj/structure/flora/bush/flowers_br/style_random,
1207012074
/obj/structure/flora/bush/fullgrass/style_random,
12075+
/mob/living/basic/chicken/hen,
1207112076
/turf/open/floor/grass,
1207212077
/area/station/service/hydroponics/garden)
1207312078
"bhl" = (
@@ -34947,6 +34952,12 @@
3494734952
/obj/effect/decal/cleanable/dirt,
3494834953
/turf/open/floor/iron/dark,
3494934954
/area/station/maintenance/department/security/upper)
34955+
"gxr" = (
34956+
/mob/living/basic/chicken{
34957+
forced_gender = "male"
34958+
},
34959+
/turf/open/floor/sandy_dirt,
34960+
/area/station/service/hydroponics/chicken)
3495034961
"gxx" = (
3495134962
/obj/effect/turf_decal/stripes/corner{
3495234963
dir = 8
@@ -37231,8 +37242,26 @@
3723137242
/turf/open/floor/engine,
3723237243
/area/station/engineering/supermatter/room)
3723337244
"hoy" = (
37234-
/obj/structure/closet/secure_closet/freezer/fridge,
3723537245
/obj/effect/turf_decal/tile/red/opposingcorners,
37246+
/obj/structure/closet/secure_closet/freezer/meat/all_access,
37247+
/obj/item/food/meat/slab/human/mutant/fly,
37248+
/obj/item/food/meat/slab/monkey,
37249+
/obj/item/food/meat/slab/monkey,
37250+
/obj/item/food/meat/slab/monkey,
37251+
/obj/item/food/meat/slab/monkey,
37252+
/obj/item/food/meat/slab/monkey,
37253+
/obj/item/food/meat/slab/chicken,
37254+
/obj/item/food/meat/slab/chicken,
37255+
/obj/item/food/meat/slab/chicken,
37256+
/obj/item/food/meat/slab/chicken,
37257+
/obj/item/food/meat/slab/chicken,
37258+
/obj/item/food/meat/slab/bugmeat,
37259+
/obj/item/food/meat/slab/bugmeat,
37260+
/obj/item/food/meat/rawbacon,
37261+
/obj/item/food/meat/rawbacon,
37262+
/obj/item/food/meat/rawbacon,
37263+
/obj/item/food/meat/rawbacon,
37264+
/obj/item/food/meat/rawbacon,
3723637265
/turf/open/floor/iron/white,
3723737266
/area/station/security/prison/mess)
3723837267
"hoJ" = (
@@ -38453,10 +38482,38 @@
3845338482
/turf/open/floor/carpet,
3845438483
/area/station/service/abandoned_gambling_den)
3845538484
"hLT" = (
38456-
/obj/structure/closet/secure_closet/freezer/kitchen,
3845738485
/obj/effect/turf_decal/tile/red/opposingcorners,
3845838486
/obj/machinery/power/apc/auto_name/directional/north,
3845938487
/obj/structure/cable,
38488+
/obj/structure/closet/secure_closet/freezer/fridge/all_access,
38489+
/obj/item/reagent_containers/condiment/enzyme{
38490+
list_reagents = list(/datum/reagent/consumable/enzyme=500);
38491+
name = "universe-sized universal enyzyme";
38492+
volume = 500
38493+
},
38494+
/obj/item/reagent_containers/condiment/rice{
38495+
list_reagents = list(/datum/reagent/consumable/rice=150);
38496+
name = "Basmati Rice Sack (4KG)";
38497+
volume = 150
38498+
},
38499+
/obj/item/storage/box/ingredients/american,
38500+
/obj/item/storage/box/ingredients/grains,
38501+
/obj/item/storage/box/ingredients/italian,
38502+
/obj/item/storage/box/ingredients/random,
38503+
/obj/item/storage/box/ingredients/random,
38504+
/obj/item/storage/box/ingredients/random,
38505+
/obj/item/reagent_containers/condiment/flour{
38506+
list_reagents = list(/datum/reagent/consumable/flour=600);
38507+
name = "Premium All-Purpose Flour (16KG)";
38508+
volume = 600
38509+
},
38510+
/obj/item/reagent_containers/condiment/soymilk,
38511+
/obj/item/reagent_containers/condiment/soymilk,
38512+
/obj/item/reagent_containers/condiment/milk,
38513+
/obj/item/reagent_containers/condiment/milk,
38514+
/obj/item/reagent_containers/condiment/soysauce,
38515+
/obj/item/reagent_containers/condiment/worcestershire,
38516+
/obj/item/reagent_containers/condiment/vinegar,
3846038517
/turf/open/floor/iron/white,
3846138518
/area/station/security/prison/mess)
3846238519
"hLU" = (
@@ -51777,6 +51834,9 @@
5177751834
/obj/structure/railing/wooden_fencing{
5177851835
dir = 4
5177951836
},
51837+
/mob/living/basic/chicken{
51838+
forced_gender = "male"
51839+
},
5178051840
/turf/open/floor/sandy_dirt,
5178151841
/area/station/service/hydroponics/chicken)
5178251842
"mUB" = (
@@ -73080,6 +73140,9 @@
7308073140
/obj/structure/railing/wooden_fencing{
7308173141
dir = 1
7308273142
},
73143+
/mob/living/basic/chicken{
73144+
forced_gender = "male"
73145+
},
7308373146
/turf/open/floor/sandy_dirt,
7308473147
/area/station/service/hydroponics/chicken)
7308573148
"vgo" = (
@@ -105403,7 +105466,7 @@ gyV
105403105466
uFX
105404105467
uGE
105405105468
gSt
105406-
otr
105469+
gxr
105407105470
doo
105408105471
reH
105409105472
uGE

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
new /obj/item/defibrillator/compact/loaded(src)
8383
new /obj/item/assembly/flash/handheld(src)
8484
new /obj/item/autosurgeon/medical_hud(src)
85+
new /obj/item/autosurgeon/organ/cyberlink_nt_low(src)
8586
new /obj/item/door_remote/chief_medical_officer(src)
8687
new /obj/item/clothing/neck/petcollar(src)
8788
new /obj/item/pet_carrier(src)

code/modules/projectiles/guns/energy/special.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,12 @@
338338
/obj/item/gun/energy/temperature/security
339339
name = "security temperature gun"
340340
desc = "A weapon that can only be used to its full potential by the truly robust."
341+
ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot)
341342

342343
/obj/item/gun/energy/temperature/freeze
343344
name = "cryogenic temperature gun"
344345
desc = "A gun that reduces temperatures. Only for those with ice in their veins."
345-
ammo_type = list(/obj/item/ammo_casing/energy/temp)
346+
ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/cryo)
346347

347348
/obj/item/gun/energy/gravity_gun
348349
name = "one-point gravitational manipulator"

code/modules/spells/spell_types/touch/scream_for_me.dm

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,20 @@
2020
span_warning("The feedback mutilates [caster]'s arm!"),
2121
span_userdanger("The spell bounces from [victim]'s skin back into your arm!"),
2222
)
23+
caster.cause_pain(BODY_ZONE_EVERYTHING, 50, BRUTE)
2324
var/obj/item/bodypart/to_wound = caster.get_holding_bodypart_of_item(hand)
24-
victim.cause_pain(BODY_ZONE_EVERYTHING, 50, BRUTE)
25-
caster.cause_wound_of_type_and_severity(WOUND_SLASH, to_wound, WOUND_SEVERITY_MODERATE, WOUND_SEVERITY_CRITICAL)
25+
var/type_wound = pick(list(/datum/wound/slash/flesh/critical, /datum/wound/slash/flesh/severe))
26+
to_wound.force_wound_upwards(type_wound)
2627

2728
/datum/action/cooldown/spell/touch/scream_for_me/cast_on_hand_hit(obj/item/melee/touch_attack/hand, mob/living/victim, mob/living/carbon/caster)
2829
if(!ishuman(victim))
2930
return
3031
var/mob/living/carbon/human/human_victim = victim
3132
human_victim.emote("scream")
33+
human_victim.cause_pain(BODY_ZONE_EVERYTHING, 50, BRUTE)
3234
for(var/obj/item/bodypart/to_wound as anything in human_victim.bodyparts)
33-
human_victim.cause_wound_of_type_and_severity(WOUND_SLASH, to_wound, WOUND_SEVERITY_MODERATE, WOUND_SEVERITY_CRITICAL)
35+
var/type_wound = pick(list(/datum/wound/slash/flesh/critical, /datum/wound/slash/flesh/severe))
36+
to_wound.force_wound_upwards(type_wound)
3437
return TRUE
3538

3639
/obj/item/melee/touch_attack/scream_for_me

monkestation/code/game/objects/items/implants/implant_misc.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
/obj/item/storage/box/syndie_kit/weapons_auth
66
name = "Weapons Authorization kit"
77

8-
/obj/item/storage/box/syndie_kit/emp/PopulateContents()
8+
/obj/item/storage/box/syndie_kit/weapons_auth/PopulateContents()
99
new /obj/item/implanter/weapons_auth(src)

monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_overwrites.dm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
return
3131
return ..()
3232

33+
/obj/item/clothing/neck/necklace/memento_mori/check_health(mob/living/source)
34+
if(source.health <= HEALTH_THRESHOLD_DEAD && IS_BLOODSUCKER(source))
35+
to_chat(source, span_warning("The Memento notices your undead soul and is enraged by your trickery"))
36+
mori()
37+
return
38+
return ..()
3339

3440
// Used when analyzing a Bloodsucker, Masquerade will hide brain traumas (Unless you're a Beefman)
3541
/mob/living/carbon/get_traumas()

monkestation/code/modules/bloodsuckers/powers/feed.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
if(!QDELETED(feed_target))
5757
log_combat(user, feed_target, "fed on blood", addition="(and took [blood_taken] blood)")
5858
to_chat(user, span_notice("You slowly release [feed_target]."))
59+
to_chat(feed_target, span_warning("Huh? What just happened? You don't remember the last few moments"))
5960
if(feed_target.stat == DEAD && !started_alive)
6061
user.add_mood_event("drankkilled", /datum/mood_event/drankkilled)
6162
bloodsuckerdatum_power.AddHumanityLost(10)

monkestation/code/modules/blueshift/designs/frontier.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@
382382
id = "colony_fab_plastic_wall_panel"
383383
build_type = COLONY_FABRICATOR
384384
materials = list(
385-
/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
386-
/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
385+
/datum/material/plastic = (5*SHEET_MATERIAL_AMOUNT),
386+
/datum/material/glass = (5*SHEET_MATERIAL_AMOUNT),
387387
)
388388
build_path = /obj/item/stack/sheet/plastic_wall_panel/ten
389389
category = list(

monkestation/code/modules/cybernetics/elements/dancing.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
var/mob/living/living_target = target
135135
final_pixel_y += living_target.body_position_pixel_y_offset
136136
animate(target, pixel_y = final_pixel_y, time = 0.5 SECONDS)
137-
137+
/*
138138
/datum/dance/head_spin/trigger_dance(mob/living/target, start=TRUE)
139139
ADD_TRAIT(target, TRAIT_IMMOBILIZED, type)
140140
var/matrix/initial_matrix = matrix(target.transform)
@@ -183,3 +183,4 @@
183183
/datum/dance/head_spin/end_dance(mob/target)
184184
continues = FALSE
185185
REMOVE_TRAIT(target, TRAIT_IMMOBILIZED, type)
186+
*/

0 commit comments

Comments
 (0)