Skip to content

Commit 6b3ce37

Browse files
MarkSuckerbergwilloxtralezabAnturKZeWaka
authored
SpacemanDMM Sanity (shiptest-ss13#12)
* SpacemanDMM Sanity fixes preceding slashes (or lack therof), make dmdoc use the typepaths rather than names, and a few disambiguations. * trigger spacemandmm reparse in CBT 'Build All' task (#58061) * Close every issue made by ZeWaka (#58701) sure whatever i totally know what im doing * Ensure consistent working directory in build.bat (#59193) * Deletes duplicate export property (#58212) * Simplified Node Bootstrap mk. II (#56797) Script tools/bootstrap/node_.ps1 will now only download a single node.exe file (32-bit variant) and nothing more. Since we don't need to unzip, we removed a dependency on a .NET component. Removed logging, because TGS4 already logs stdout/err, while all this fancy output redirection breaks on older PowerShell versions. node.bat uses a system-wide node exe if available CBT will not mislead users by printing things like "missing tgstation.dmb" Co-authored-by: William Wallace <[email protected]> Co-authored-by: tralezab <[email protected]> Co-authored-by: AnturK <[email protected]> Co-authored-by: ZeWaka <[email protected]> Co-authored-by: Aleksej Komarov <[email protected]>
1 parent 839bb6d commit 6b3ce37

File tree

44 files changed

+120
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+120
-107
lines changed

.vscode/tasks.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
"$dreammaker",
1212
"$eslint-stylish"
1313
],
14-
"group": "build",
14+
"group": {
15+
"kind": "build",
16+
"isDefault": true
17+
},
18+
"dependsOn": "dm: reparse",
1519
"label": "Build All"
1620
},
1721
{
@@ -34,6 +38,11 @@
3438
],
3539
"group": "build",
3640
"label": "tgui: build"
41+
},
42+
{
43+
"command": "${command:dreammaker.reparse}",
44+
"group": "build",
45+
"label": "dm: reparse"
3746
}
3847
]
3948
}

Build.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@call tools\build\build
1+
@call "%~dp0\tools\build\build"
22
@pause

SpacemanDMM.toml

+7
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
[langserver]
22
dreamchecker = true
3+
4+
[code_standards]
5+
disallow_relative_type_definitions = true
6+
disallow_relative_proc_definitions = true
7+
8+
[dmdoc]
9+
use_typepath_names = true

code/__HELPERS/unsorted.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ B --><-- A
10311031
return closest_atom
10321032

10331033

1034-
proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
1034+
/proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
10351035
if (value == FALSE) //nothing should be calling us with a number, so this is safe
10361036
value = input("Enter type to find (blank for all, cancel to cancel)", "Search for type") as null|text
10371037
if (isnull(value))

code/datums/traits/good.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
lose_text = "<span class='danger'>You feel isolated from others.</span>"
6262
medical_record_text = "Patient is highly perceptive of and sensitive to social cues, or may possibly have ESP. Further testing needed."
6363

64-
datum/quirk/fan_clown
64+
/datum/quirk/fan_clown
6565
name = "Clown Fan"
6666
desc = "You enjoy clown antics and get a mood boost from wearing your clown pin."
6767
value = 1
@@ -81,7 +81,7 @@ datum/quirk/fan_clown
8181
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
8282
fan.add_hud_to(H)
8383

84-
datum/quirk/fan_mime
84+
/datum/quirk/fan_mime
8585
name = "Mime Fan"
8686
desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."
8787
value = 1

code/datums/traits/neutral.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
var/datum/species/species = H.dna.species
3131
if(initial(species.liked_food) & MEAT)
3232
species.liked_food |= MEAT
33-
if(!initial(species.disliked_food) & MEAT)
33+
if(!(initial(species.disliked_food) & MEAT))
3434
species.disliked_food &= ~MEAT
3535

3636
/datum/quirk/snob

code/game/machinery/doors/airlock.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@
778778
else
779779
. += "It looks very robust."
780780

781-
if(issilicon(user) && (!machine_stat & BROKEN))
781+
if(issilicon(user) && !(machine_stat & BROKEN))
782782
. += "<span class='notice'>Shift-click [src] to [ density ? "open" : "close"] it.</span>"
783783
. += "<span class='notice'>Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts.</span>"
784784
. += "<span class='notice'>Alt-click [src] to [ secondsElectrified ? "un-electrify" : "permanently electrify"] it.</span>"

code/game/machinery/hologram.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Possible to do for anyone motivated enough:
8484
desc = "It's a floor-mounted device for projecting holographic images. This one will refuse to auto-connect incoming calls."
8585
secure = TRUE
8686

87-
obj/machinery/holopad/secure/Initialize()
87+
/obj/machinery/holopad/secure/Initialize()
8888
. = ..()
8989
var/obj/item/circuitboard/machine/holopad/board = circuit
9090
board.secure = TRUE

code/game/mecha/combat/durand.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Expects a turf. Returns true if the attack should be blocked, false if not.*/
9494
. = TRUE
9595
return
9696

97-
obj/mecha/combat/durand/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0)
97+
/obj/mecha/combat/durand/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0)
9898
if(defense_check(user.loc))
9999
log_message("Attack absorbed by defense field. Attacker - [user].", LOG_MECHA, color="orange")
100100
shield.attack_generic(user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration)

code/game/objects/items/dice.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
/obj/item/dice/d6
9494
name = "d6"
9595

96-
obj/item/dice/d6/ebony
96+
/obj/item/dice/d6/ebony
9797
name = "ebony die"
9898
desc = "A die with six sides made of dense black wood. It feels cold and heavy in your hand."
9999
icon_state = "de6"

code/game/objects/items/grenades/festive.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
/obj/item/grenade/firecracker/fire_act(exposed_temperature, exposed_volume)
8585
prime()
8686

87-
obj/item/grenade/firecracker/wirecutter_act(mob/living/user, obj/item/I)
87+
/obj/item/grenade/firecracker/wirecutter_act(mob/living/user, obj/item/I)
8888
if(active)
8989
return
9090
if(det_time)
@@ -96,7 +96,7 @@ obj/item/grenade/firecracker/wirecutter_act(mob/living/user, obj/item/I)
9696
else
9797
to_chat(user, "<span class='danger'>You've already removed all of the fuse!</span>")
9898

99-
obj/item/grenade/firecracker/preprime(mob/user, delayoverride, msg = TRUE, volume = 80)
99+
/obj/item/grenade/firecracker/preprime(mob/user, delayoverride, msg = TRUE, volume = 80)
100100
var/turf/T = get_turf(src)
101101
log_grenade(user, T)
102102
if(user)

code/game/objects/structures/tables_racks.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
to_chat(user, "<span class='danger'>Throwing [pushed_mob] onto the table might hurt them!</span>")
119119
return
120120
var/added_passtable = FALSE
121-
if(!pushed_mob.pass_flags & PASSTABLE)
121+
if(!(pushed_mob.pass_flags & PASSTABLE))
122122
added_passtable = TRUE
123123
pushed_mob.pass_flags |= PASSTABLE
124124
pushed_mob.Move(src.loc)

code/modules/admin/verbs/one_click_antag.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
chosen_candidate.client.prefs.copy_to(ERTOperative)
379379
ERTOperative.key = chosen_candidate.key
380380

381-
if(ertemplate.enforce_human || !ERTOperative.dna.species.changesource_flags & ERT_SPAWN) // Don't want any exploding plasmemes
381+
if(ertemplate.enforce_human || !(ERTOperative.dna.species.changesource_flags & ERT_SPAWN)) // Don't want any exploding plasmemes
382382
ERTOperative.set_species(/datum/species/human)
383383

384384
//Give antag datum

code/modules/antagonists/_common/antag_datum.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ GLOBAL_LIST_EMPTY(antagonists)
273273
show_name_in_check_antagonists = TRUE //They're all different
274274
var/datum/team/custom_team
275275

276-
datum/antagonist/custom/create_team(datum/team/team)
276+
/datum/antagonist/custom/create_team(datum/team/team)
277277
custom_team = team
278278

279279
/datum/antagonist/custom/get_team()

code/modules/atmospherics/gasmixtures/reactions.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -246,18 +246,18 @@
246246
return cached_results["fire"] ? REACTING : NO_REACTION
247247

248248
//freon reaction (is not a fire yet)
249-
datum/gas_reaction/freonfire
249+
/datum/gas_reaction/freonfire
250250
priority = -3
251251
name = "Freon combustion"
252252
id = "freonfire"
253253

254-
datum/gas_reaction/freonfire/init_reqs()
254+
/datum/gas_reaction/freonfire/init_reqs()
255255
min_requirements = list(
256256
/datum/gas/oxygen = MINIMUM_MOLE_COUNT,
257257
/datum/gas/freon = MINIMUM_MOLE_COUNT
258258
)
259259

260-
datum/gas_reaction/freonfire/react(datum/gas_mixture/air, datum/holder)
260+
/datum/gas_reaction/freonfire/react(datum/gas_mixture/air, datum/holder)
261261
var/energy_released = 0
262262
var/old_heat_capacity = air.heat_capacity()
263263
var/temperature = air.return_temperature()

code/modules/client/preferences_toggles.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)()
284284
return C.prefs.chat_toggles & CHAT_OOC
285285

286286
//BeginWS Edit
287-
TOGGLE_CHECKBOX(datum/verbs/menu/settings, listen_looc)()
287+
TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_looc)()
288288
set name = "Show/Hide LOOC"
289289
set category = "Preferences"
290290
set desc = "Toggles seeing Local Out Of Character chat"

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
)
2424
result = /obj/item/reagent_containers/food/snacks/donut/chaos
2525

26-
datum/crafting_recipe/food/donut/meat
26+
/datum/crafting_recipe/food/donut/meat
2727
time = 15
2828
name = "Meat donut"
2929
reqs = list(

code/modules/mining/aux_base_camera.dm

+7-7
Original file line numberDiff line numberDiff line change
@@ -202,27 +202,27 @@
202202
name = "Select Airlock Type"
203203
button_icon_state = "airlock_select"
204204

205-
datum/action/innate/aux_base/airlock_type/Activate()
205+
/datum/action/innate/aux_base/airlock_type/Activate()
206206
if(..())
207207
return
208208

209209
B.RCD.change_airlock_setting()
210210

211211

212-
datum/action/innate/aux_base/window_type
212+
/datum/action/innate/aux_base/window_type
213213
name = "Select Window Type"
214214
button_icon_state = "window_select"
215215

216-
datum/action/innate/aux_base/window_type/Activate()
216+
/datum/action/innate/aux_base/window_type/Activate()
217217
if(..())
218218
return
219219
B.RCD.toggle_window_type()
220220

221-
datum/action/innate/aux_base/place_fan
221+
/datum/action/innate/aux_base/place_fan
222222
name = "Place Tiny Fan"
223223
button_icon_state = "build_fan"
224224

225-
datum/action/innate/aux_base/place_fan/Activate()
225+
/datum/action/innate/aux_base/place_fan/Activate()
226226
if(..())
227227
return
228228

@@ -244,11 +244,11 @@ datum/action/innate/aux_base/place_fan/Activate()
244244
to_chat(owner, "<span class='notice'>Tiny fan placed. [B.fans_remaining] remaining.</span>")
245245
playsound(fan_turf, 'sound/machines/click.ogg', 50, TRUE)
246246

247-
datum/action/innate/aux_base/install_turret
247+
/datum/action/innate/aux_base/install_turret
248248
name = "Install Plasma Anti-Wildlife Turret"
249249
button_icon_state = "build_turret"
250250

251-
datum/action/innate/aux_base/install_turret/Activate()
251+
/datum/action/innate/aux_base/install_turret/Activate()
252252
if(..())
253253
return
254254

code/modules/mob/living/carbon/human/species_types/IPC.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
else if(MUTCOLORS in C.dna.species.species_traits)
6666
C.dna.species.species_traits -= MUTCOLORS
6767

68-
datum/species/ipc/on_species_loss(mob/living/carbon/C)
68+
/datum/species/ipc/on_species_loss(mob/living/carbon/C)
6969
. = ..()
7070
if(change_screen)
7171
change_screen.Remove(C)

code/modules/mob/living/simple_animal/hostile/bear.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
to_chat(user, "<span class='info'>You strap the armor plating to [A] and sharpen [A.p_their()] claws with the nail filer. This was a great idea.</span>")
124124
qdel(src)
125125

126-
mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it.
126+
/mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it.
127127
name = "Terrygold"
128128
icon_state = "butterbear"
129129
icon_living = "butterbear"
@@ -168,7 +168,7 @@ mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Seve
168168
to_chat(src, "<span class='notice'>Your name is now <b>\"new_name\"</b>!</span>")
169169
name = new_name
170170

171-
mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path.
171+
/mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path.
172172
if(isliving(target))
173173
var/mob/living/L = target
174174
if((L.body_position == STANDING_UP))

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
name = "Wrap"
390390
panel = "Spider"
391391
active = FALSE
392-
datum/action/spell_action/action = null
392+
action = null
393393
desc = "Wrap something or someone in a cocoon. If it's a living being, you'll also consume them, allowing you to lay eggs."
394394
ranged_mousepointer = 'icons/effects/mouse_pointers/wrap_target.dmi'
395395
action_icon = 'icons/mob/actions/actions_animal.dmi'

code/modules/mob/living/simple_animal/hostile/hostile.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
DestroyObjectsInDirection(direction)
467467

468468

469-
mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with megafauna destroying everything around them
469+
/mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with megafauna destroying everything around them
470470
if(environment_smash)
471471
EscapeConfinement()
472472
for(var/dir in GLOB.cardinals)

code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ Difficulty: Medium
521521
else
522522
animate(src, pixel_x = -16, pixel_z = 0, time = 5)
523523

524-
obj/effect/temp_visual/fireball
524+
/obj/effect/temp_visual/fireball
525525
icon = 'icons/obj/wizard.dmi'
526526
icon_state = "fireball"
527527
name = "fireball"

code/modules/mob/living/simple_animal/hostile/space_dragon.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
* Arguments:
209209
* * turf/T - The turf to trigger the effects on.
210210
*/
211-
mob/living/simple_animal/hostile/space_dragon/proc/dragon_fire_line(turf/T)
211+
/mob/living/simple_animal/hostile/space_dragon/proc/dragon_fire_line(turf/T)
212212
var/list/hit_list = list()
213213
hit_list += src
214214
new /obj/effect/hotspot(T)

code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,5 +186,5 @@
186186
* Arguments:
187187
* * datum/beam/vine - The vine to be removed from the list.
188188
*/
189-
mob/living/simple_animal/hostile/venus_human_trap/proc/remove_vine(datum/beam/vine, force)
189+
/mob/living/simple_animal/hostile/venus_human_trap/proc/remove_vine(datum/beam/vine, force)
190190
vines -= vine

code/modules/photography/photos/album.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
name = "photo album (Library)"
9797
persistence_id = "library"
9898

99-
obj/item/storage/photo_album/chapel
99+
/obj/item/storage/photo_album/chapel
100100
name = "photo album (Chapel)"
101101
persistence_id = "chapel"
102102

103-
obj/item/storage/photo_album/prison
103+
/obj/item/storage/photo_album/prison
104104
name = "photo album (Prison)"
105105
persistence_id = "prison"

code/modules/projectiles/guns/ballistic/rifle.dm

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
tac_reloads = FALSE
1717
weapon_weight = WEAPON_MEDIUM
1818

19-
obj/item/gun/ballistic/rifle/update_overlays()
19+
/obj/item/gun/ballistic/rifle/update_overlays()
2020
. = ..()
2121
. += "[icon_state]_bolt[bolt_locked ? "_locked" : ""]"
2222

23-
obj/item/gun/ballistic/rifle/rack(mob/user = null)
23+
/obj/item/gun/ballistic/rifle/rack(mob/user = null)
2424
if (bolt_locked == FALSE)
2525
to_chat(user, "<span class='notice'>You open the bolt of \the [src].</span>")
2626
playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
@@ -30,12 +30,12 @@ obj/item/gun/ballistic/rifle/rack(mob/user = null)
3030
return
3131
drop_bolt(user)
3232

33-
obj/item/gun/ballistic/rifle/can_shoot()
33+
/obj/item/gun/ballistic/rifle/can_shoot()
3434
if (bolt_locked)
3535
return FALSE
3636
return ..()
3737

38-
obj/item/gun/ballistic/rifle/attackby(obj/item/A, mob/user, params)
38+
/obj/item/gun/ballistic/rifle/attackby(obj/item/A, mob/user, params)
3939
if (!bolt_locked)
4040
to_chat(user, "<span class='notice'>The bolt is closed!</span>")
4141
return

code/modules/reagents/reagent_containers/chem_pack.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
. += "<span class='notice'>Alt-click to seal it.</span>"
3434

3535

36-
obj/item/reagent_containers/chem_pack/attack_self(mob/user)
36+
/obj/item/reagent_containers/chem_pack/attack_self(mob/user)
3737
if(sealed)
3838
return
3939
..()

code/modules/research/nanites/nanite_programs.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,14 @@
247247
software_error()
248248

249249
/datum/nanite_program/proc/on_shock(shock_damage)
250-
if(!program_flags & NANITE_SHOCK_IMMUNE)
250+
if(!(program_flags & NANITE_SHOCK_IMMUNE))
251251
if(prob(10))
252252
software_error()
253253
else if(prob(33))
254254
qdel(src)
255255

256256
/datum/nanite_program/proc/on_minor_shock()
257-
if(!program_flags & NANITE_SHOCK_IMMUNE)
257+
if(!(program_flags & NANITE_SHOCK_IMMUNE))
258258
if(prob(10))
259259
software_error()
260260

code/modules/research/xenobiology/crossbreeding/_status_effects.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
duration = -1
223223
alert_type = null
224224

225-
datum/status_effect/rebreathing/tick()
225+
/datum/status_effect/rebreathing/tick()
226226
owner.adjustOxyLoss(-6, 0) //Just a bit more than normal breathing.
227227

228228
///////////////////////////////////////////////////////
@@ -504,7 +504,7 @@ datum/status_effect/rebreathing/tick()
504504
ADD_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
505505
return ..()
506506

507-
datum/status_effect/stabilized/blue/on_remove()
507+
/datum/status_effect/stabilized/blue/on_remove()
508508
REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
509509

510510
/datum/status_effect/stabilized/metal

0 commit comments

Comments
 (0)