Skip to content

Commit 682880e

Browse files
dageavtobusnickdageavtobusnick
committed
Merge remote-tracking branch 'upstream/master220' into facehugger_mob
2 parents 0cdb3d2 + 2de8e50 commit 682880e

File tree

36 files changed

+1675
-402
lines changed

36 files changed

+1675
-402
lines changed

‎_maps/map_files/cerestation/Lavaland.dmm

+44-31
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,6 @@
204204
},
205205
/turf/simulated/floor/plating,
206206
/area/mine/maintenance)
207-
"aF" = (
208-
/obj/machinery/atmospherics/pipe/simple/visible/supply{
209-
dir = 4
210-
},
211-
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
212-
dir = 4
213-
},
214-
/obj/structure/cable{
215-
icon_state = "4-8"
216-
},
217-
/obj/structure/lattice/catwalk/mapping,
218-
/turf/simulated/floor/lava/lava_land_surface,
219-
/area/lavaland/surface/outdoors)
220207
"aI" = (
221208
/obj/machinery/vending/boozeomat,
222209
/turf/simulated/floor/plasteel{
@@ -284,7 +271,8 @@
284271
icon_state = "1-2"
285272
},
286273
/obj/structure/lattice/catwalk/mapping,
287-
/turf/simulated/floor/lava/lava_land_surface,
274+
/obj/effect/mapping_helpers/no_lava,
275+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
288276
/area/lavaland/surface/outdoors)
289277
"aR" = (
290278
/turf/simulated/wall/r_wall,
@@ -674,7 +662,8 @@
674662
dir = 4
675663
},
676664
/obj/structure/lattice/catwalk/mapping,
677-
/turf/simulated/floor/lava/lava_land_surface,
665+
/obj/effect/mapping_helpers/no_lava,
666+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
678667
/area/lavaland/surface/outdoors)
679668
"cp" = (
680669
/obj/machinery/shower{
@@ -798,7 +787,8 @@
798787
icon_state = "1-2"
799788
},
800789
/obj/structure/lattice/catwalk/mapping,
801-
/turf/simulated/floor/lava/lava_land_surface,
790+
/obj/effect/mapping_helpers/no_lava,
791+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
802792
/area/lavaland/surface/outdoors)
803793
"cW" = (
804794
/obj/structure/stone_tile/surrounding_tile{
@@ -1046,7 +1036,8 @@
10461036
icon_state = "2-8"
10471037
},
10481038
/obj/structure/lattice/catwalk/mapping,
1049-
/turf/simulated/floor/lava/lava_land_surface,
1039+
/obj/effect/mapping_helpers/no_lava,
1040+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
10501041
/area/lavaland/surface/outdoors)
10511042
"ef" = (
10521043
/obj/structure/table,
@@ -1268,7 +1259,8 @@
12681259
icon_state = "2-8"
12691260
},
12701261
/obj/structure/lattice/catwalk/mapping,
1271-
/turf/simulated/floor/lava/lava_land_surface,
1262+
/obj/effect/mapping_helpers/no_lava,
1263+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
12721264
/area/lavaland/surface/outdoors)
12731265
"fj" = (
12741266
/obj/structure/cable{
@@ -3503,7 +3495,8 @@
35033495
icon_state = "1-4"
35043496
},
35053497
/obj/structure/lattice/catwalk/mapping,
3506-
/turf/simulated/floor/lava/lava_land_surface,
3498+
/obj/effect/mapping_helpers/no_lava,
3499+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
35073500
/area/lavaland/surface/outdoors)
35083501
"rV" = (
35093502
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -4053,7 +4046,8 @@
40534046
icon_state = "4-8"
40544047
},
40554048
/obj/structure/lattice/catwalk/mapping,
4056-
/turf/simulated/floor/lava/lava_land_surface,
4049+
/obj/effect/mapping_helpers/no_lava,
4050+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
40574051
/area/lavaland/surface/outdoors)
40584052
"wD" = (
40594053
/obj/item/flashlight/lantern{
@@ -4344,7 +4338,8 @@
43444338
icon_state = "4-8"
43454339
},
43464340
/obj/structure/lattice/catwalk/mapping,
4347-
/turf/simulated/floor/lava/lava_land_surface,
4341+
/obj/effect/mapping_helpers/no_lava,
4342+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
43484343
/area/lavaland/surface/outdoors)
43494344
"ze" = (
43504345
/obj/structure/railing{
@@ -4357,7 +4352,8 @@
43574352
/obj/structure/disposalpipe/segment,
43584353
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
43594354
/obj/structure/lattice/catwalk/mapping,
4360-
/turf/simulated/floor/lava/lava_land_surface,
4355+
/obj/effect/mapping_helpers/no_lava,
4356+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
43614357
/area/lavaland/surface/outdoors)
43624358
"zi" = (
43634359
/obj/structure/stone_tile/slab,
@@ -4409,7 +4405,8 @@
44094405
icon_state = "2-4"
44104406
},
44114407
/obj/structure/lattice/catwalk/mapping,
4412-
/turf/simulated/floor/lava/lava_land_surface,
4408+
/obj/effect/mapping_helpers/no_lava,
4409+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
44134410
/area/lavaland/surface/outdoors)
44144411
"zt" = (
44154412
/obj/structure/table,
@@ -4658,7 +4655,8 @@
46584655
icon_state = "1-8"
46594656
},
46604657
/obj/structure/lattice/catwalk/mapping,
4661-
/turf/simulated/floor/lava/lava_land_surface,
4658+
/obj/effect/mapping_helpers/no_lava,
4659+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
46624660
/area/lavaland/surface/outdoors)
46634661
"Bm" = (
46644662
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf{
@@ -6110,6 +6108,20 @@
61106108
/obj/structure/stone_tile/block,
61116109
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
61126110
/area/lavaland/surface/outdoors/necropolis)
6111+
"MT" = (
6112+
/obj/machinery/atmospherics/pipe/simple/visible/supply{
6113+
dir = 4
6114+
},
6115+
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
6116+
dir = 4
6117+
},
6118+
/obj/structure/cable{
6119+
icon_state = "4-8"
6120+
},
6121+
/obj/structure/lattice/catwalk/mapping,
6122+
/obj/effect/mapping_helpers/no_lava,
6123+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
6124+
/area/lavaland/surface/outdoors)
61136125
"Ne" = (
61146126
/obj/effect/decal/cleanable/dirt,
61156127
/turf/simulated/floor/plasteel{
@@ -6945,7 +6957,7 @@
69456957
icon_state = "2-4"
69466958
},
69476959
/obj/structure/lattice/catwalk/mapping,
6948-
/turf/simulated/floor/lava/lava_land_surface,
6960+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
69496961
/area/lavaland/surface/outdoors)
69506962
"Vw" = (
69516963
/obj/structure/stone_tile/surrounding_tile,
@@ -6973,7 +6985,8 @@
69736985
icon_state = "2-4"
69746986
},
69756987
/obj/structure/lattice/catwalk/mapping,
6976-
/turf/simulated/floor/lava/lava_land_surface,
6988+
/obj/effect/mapping_helpers/no_lava,
6989+
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
69776990
/area/lavaland/surface/outdoors)
69786991
"VE" = (
69796992
/obj/structure/stone_tile/center,
@@ -65307,7 +65320,7 @@ aj
6530765320
aj
6530865321
aj
6530965322
aj
65310-
aF
65323+
MT
6531165324
aR
6531265325
lC
6531365326
aR
@@ -65822,7 +65835,7 @@ aj
6582265835
aj
6582365836
aj
6582465837
aj
65825-
aF
65838+
MT
6582665839
aj
6582765840
aj
6582865841
at
@@ -67362,7 +67375,7 @@ bV
6736267375
ol
6736367376
bS
6736467377
Zf
67365-
aF
67378+
MT
6736667379
aj
6736767380
aj
6736867381
aj
@@ -67619,7 +67632,7 @@ bV
6761967632
bV
6762067633
aK
6762167634
Zf
67622-
aF
67635+
MT
6762367636
aj
6762467637
aj
6762567638
aj
@@ -67876,7 +67889,7 @@ JS
6787667889
Lc
6787767890
Km
6787867891
Zf
67879-
aF
67892+
MT
6788067893
aj
6788167894
aj
6788267895
aj

‎code/_onclick/ai.dm

+5-2
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
if(lethal_is_configurable)
200200
lethal = !lethal
201201
updateTurrets()
202+
return CLICK_ACTION_SUCCESS
202203

203204
// AIRLOCKS
204205

@@ -219,13 +220,14 @@
219220

220221
/obj/machinery/door/airlock/ai_click_alt(mob/living/silicon/ai/user) // Electrifies doors.
221222
if(!ai_control_check(user))
222-
return
223+
return CLICK_ACTION_BLOCKING
223224
if(wires.is_cut(WIRE_ELECTRIFY))
224-
to_chat(user, "<span class='warning'>The electrification wire is cut - Cannot electrify the door.</span>")
225+
to_chat(user, span_warning("The electrification wire is cut - Cannot electrify the door."))
225226
if(isElectrified())
226227
electrify(0, user, TRUE) // un-shock
227228
else
228229
electrify(-1, user, TRUE) // permanent shock
230+
return CLICK_ACTION_SUCCESS
229231

230232

231233
/obj/machinery/door/airlock/AIMiddleClick(mob/living/user) // Toggles door bolt lights.
@@ -240,3 +242,4 @@
240242

241243
/obj/machinery/ai_slipper/ai_click_alt(mob/living/silicon/ai/user) //Dispenses liquid if on
242244
Activate()
245+
return CLICK_ACTION_SUCCESS

‎code/_onclick/hud/screen_objects.dm

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
var/obj/master = null //A reference to the object in the slot. Grabs or items, generally.
1717
VAR_PRIVATE/datum/hud/hud = null
1818
appearance_flags = NO_CLIENT_COLOR
19+
interaction_flags_click = BYPASS_ADJACENCY
1920
/**
2021
* Map name assigned to this object.
2122
* Automatically set by /client/proc/add_obj_to_map.

‎code/controllers/subsystem/processing/ai_controllers.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PROCESSING_SUBSYSTEM_DEF(ai_controllers)
1212

1313
/datum/controller/subsystem/processing/ai_controllers/Initialize(timeofday)
1414
SetupAIBehaviors()
15-
return ..()
15+
return SS_INIT_SUCCESS
1616

1717
/datum/controller/subsystem/processing/ai_controllers/proc/SetupAIBehaviors()
1818
ai_behaviors = list()

‎code/datums/components/defibrillator.dm

+6-6
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@
152152
return
153153

154154
user.visible_message(
155-
span_warning("[user] начина[pluralize_ru(user.gender, "ет", "ют")] размещать лопасти дефибриллятора на груди [target.name]."),
156-
span_warning("Вы начинаете размещать лопасти дефибриллятора на груди [target.name]."),
155+
span_warning("[user] начина[pluralize_ru(user.gender, "ет", "ют")] размещать электроды дефибриллятора на груди [target.name]."),
156+
span_warning("Вы начинаете размещать электроды дефибриллятора на груди [target.name]."),
157157
)
158158

159159
busy = TRUE
@@ -168,8 +168,8 @@
168168
return
169169

170170
user.visible_message(
171-
span_notice("[user] разместил[genderize_ru(user.gender, "", "а", "о", "и")] лопасти дефибриллятора на груди [target.name]."),
172-
span_notice("Вы разместили лопасти дефибриллятора на груди [target.name]."),
171+
span_notice("[user] разместил[genderize_ru(user.gender, "", "а", "о", "и")] электроды дефибриллятора на груди [target.name]."),
172+
span_notice("Вы разместили электроды дефибриллятора на груди [target.name]."),
173173
)
174174
playsound(get_turf(defib_ref), 'sound/machines/defib_charge.ogg', 50, 0)
175175

@@ -299,8 +299,8 @@
299299
return
300300
busy = TRUE
301301
target.visible_message(
302-
span_danger("[user] коснул[genderize_ru(user.gender, "ся", "ась", "ось", "ись")] [target.name] лопастями боевого дефибриллятора!"),
303-
span_userdanger("[user] коснул[genderize_ru(user.gender, "ся", "ась", "ось", "ись")] вас лопастями боевого дефибриллятора!"),
302+
span_danger("[user] коснул[genderize_ru(user.gender, "ся", "ась", "ось", "ись")] [target.name] электродами боевого дефибриллятора!"),
303+
span_userdanger("[user] коснул[genderize_ru(user.gender, "ся", "ась", "ось", "ись")] вас электродами боевого дефибриллятора!"),
304304
)
305305
if(ignore_hardsuits)
306306
target.apply_damage(70, STAMINA)

‎code/datums/outfits/outfit_admin.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@
607607

608608
var/obj/item/pda/PDA = H.wear_pda
609609
if(istype(PDA))
610-
PDA.owner = H.real_name
610+
PDA.update_owner_name(H.real_name)
611611
PDA.ownjob = JOB_TITLE_MIME
612612
PDA.name = "PDA-[H.real_name] ([PDA.ownjob])"
613613

‎code/datums/spell.dm

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
8989
/// What panel the proc holder needs to go on.
9090
density = FALSE
9191
opacity = FALSE
92+
interaction_flags_click = BYPASS_ADJACENCY
9293

9394
/// Not relevant at now, but may be important later if there are changes to how spells work. the ones I used for now will probably be changed... maybe spell presets? lacking flexibility but with some other benefit?
9495
var/school = "evocation"

‎code/game/gamemodes/miniantags/abduction/abduction_gear.dm

+1
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
979979
advanced = TRUE
980980
icon_state = "alien_hscanner"
981981
item_state = "alien_hscanner"
982+
theme = "abductor"
982983

983984
/obj/item/storage/firstaid_abductor
984985
name = "alien medkit"

‎code/game/jobs/job/job.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
var/obj/item/pda/PDA = H.wear_pda
298298
var/obj/item/card/id/C = H.wear_id
299299
if(istype(PDA) && istype(C))
300-
PDA.owner = H.real_name
300+
PDA.update_owner_name(H.real_name)
301301
PDA.ownjob = C.assignment
302302
PDA.ownrank = C.rank
303303
PDA.update_appearance(UPDATE_NAME)

‎code/game/machinery/ai_slipper.dm

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
anchored = TRUE
88
max_integrity = 200
99
armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
10+
interaction_flags_click = ALLOW_SILICON_REACH
1011
var/uses = 20
1112
var/disabled = TRUE
1213
var/locked = TRUE
@@ -68,11 +69,11 @@
6869
if(cooldown_on)
6970
to_chat(user, span_warning("[src] is still recharging!"))
7071
return
71-
72+
7273
var/datum/effect_system/fluid_spread/foam/s = new()
7374
s.set_up(range = 3, location = loc)
7475
s.start()
75-
76+
7677
uses--
7778
cooldown_on = TRUE
7879
update_icon(UPDATE_ICON_STATE)

‎code/game/machinery/defib_mount.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
return
8989

9090
if(!defib.paddles_on_defib)
91-
balloon_alert(user, "лопасти уже кем-то взяты!")
91+
balloon_alert(user, "электроды уже кем-то взяты!")
9292
return
9393

9494
defib.dispence_paddles(user)

‎code/game/machinery/doors/airlock.dm

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
5959
assemblytype = /obj/structure/door_assembly
6060
siemens_strength = 1
6161
smoothing_groups = SMOOTH_GROUP_AIRLOCK
62+
interaction_flags_click = ALLOW_SILICON_REACH
6263

6364
var/security_level = 0 //How much are wires secured
6465
var/aiControlDisabled = AICONTROLDISABLED_OFF

‎code/game/machinery/turret_control.dm

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
anchored = TRUE
1515
density = FALSE
1616
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
17+
interaction_flags_click = ALLOW_SILICON_REACH
1718
var/enabled = FALSE
1819
var/lethal = FALSE
1920
var/lethal_is_configurable = TRUE

‎code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
color = "#752424"
399399
lifetime = 3 SMOKE_TICK_TO_SECONDS
400400

401-
/obj/effect/particle_effect/fluid/smoke/smoke_mob(mob/living/carbon/victim)
401+
/obj/effect/particle_effect/fluid/smoke/vomiting/smoke_mob(mob/living/carbon/victim)
402402
. = ..()
403403
if(!.)
404404
return .

0 commit comments

Comments
 (0)