Skip to content

Commit

Permalink
[MDB Ignore] Christmas Lights ! (DO NOT SQUASH THE COMMITS) (#31620)
Browse files Browse the repository at this point in the history
* [ci skip] Automatic changelog update.

* cleaned up world/New, unused stuff (#31194)

* Move tgui logs to the href logs file (#31210)

* Fixes #31201 (#31212)

* Cult 4 November balance (mostly) and content (a bit) update (#31196)

* Cult 4 November balance (mostly) and content (a bit) update

* better document that

* derp

* bigger

* true freeform

* wording

* [ci skip] Automatic changelog update.

* check_contents (#31217)

* Makes workaround not go nuclear sometimes (#31224)

* Just fucking kills the movement workaround (#31228)

* Various Fixes (#31231)

* Minor window fixes (#31229)

* Old window fixes

* Comment cleanup

* I actually forgot this

* Fixed religion UI bugs (#31237)

* [ci skip] Automatic changelog update.

* gult (#31240)

* Optimized loading vaults (#31239)

* Fixed a bunch of errors when loading vaults (#31247)

* allow resisting out of straight jackets (but you can break your arms doing it and broken arms let you do it faster) (#31195)

* allow resisting out of straight jackets

* with blackjack and hookers

* removed arms also help, robotic arms cannot be broken and never help

* [ci skip] Automatic changelog update.

* Read (#31204)

* [ci skip] Automatic changelog update.

* Zamito Crisps, and Zam Drink Sprite Update (#31206)

* Zamrito_Mania

* A_Pinch_of_Extra_Salt

* Zamrito_No_More

* More_Nutritious_Stok_Flavor

* Zam_Drink_Sprites_Update

* Zamitos_Sprite_Updates

* Blue_Goo_Reagent_Added

* Updated_Blue_Goo_Zamitos_Descriptions

* Second_Update

* Slight_Tweak

* Undid_Previous_Tweak

* Small_Chance_of_Classic

* Old_Fashioned_Zam_Tea

* Tank dispenser alt-click radial menu (and better looking UI window) (#31209)

* Replaces tank dispenser UI with radial menu

* No consts allowed

* Checks

* Makes it horizontal

* Tank dispenser alt-click radial menu (and better looking UI window)

* Consistency

* Fix

* Redundant title

* Simpler icons

* Smaller menu

* Actually smaller now

Co-authored-by: kanef <[email protected]>

* red (#31216)

* Removes lowfat cult room (#31223)

* Removes lowfat cult room

* update

* The change (#31226)

* [ci skip] Automatic changelog update.

* Buffs the fists of the rockernaut (#31244)

* Buffs the fists of the rockernaut

* Adds some knockout too

Co-authored-by: kanef <[email protected]>

* Escape From Central Command (#31248)

* fix+cleanup

* move

* fix again, reword

* [ci skip] Automatic changelog update.

* Allows medical belts to hold viro tape (#31252)

* tape on your belt. belt tape.

* syndie tape too

* commas, my old foe. we meet again.

* [ci skip] Automatic changelog update.

* Fixes auto mining (#31270)

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Fix toy dual-sword inhands. (#31266)

* states

* unneeded

* [ci skip] Automatic changelog update.

* Fro-bot (#31271)

* frobot

* fix side states

* This probably fixes some bugs (#31275)

* Fixes nogun exploit (#31267)

* fix nogun exploit

* fix no-wizards being able to buy nogun

* Allows fat people to wear a poncho (#31261)

* Various Turret Fixes + Pulse Turret Sprite (#31265)

* fix icon state

* blue icon

* SHIFTY!!!!

* remove hitlers

* faction fix

* Changes z-level defines to map datum vars (#31268)

* Changes z-level defines to map datum vars

* Compile?

* Maybe now

* Map compile

* Updating these

* Adding this back again

* Nicer

Co-authored-by: kanef <[email protected]>

* Knock tacklers away with baseball bats (#31257)

* Renamed straight jackets to straitjackets (#31255)

* Renamed straight jackets to strait jackets

* renamed strait jacket to straitjacket

* Reduces number of spawning Hobo Shacks (#31250)

* Update hobo shack frequency

* Update map.dm

* [ci skip] Automatic changelog update.

* [ci skip] Automatic changelog update.

* automatic aquarium cleaner (#31178)

* *aquarium automation
make the module with science
feeds and cleans
feed and sneed

* due to popular demand, we don't feed here anymore

* conforming to public

* ayy_not_Ayy (#31191)

* Inverts CTRL and ALT modifiers on numpad def zone targeting hotkeys (makes CTRL main key) (#31232)

* Inverts CTRL and ALT on numpad def zone targeting hotkeys

* Azerty too

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* New Vault: Pod Station (#31272)

* NuVault_Pod_Station

* Reoriented_Miner_Glass

* Added_Ancient_Cryopod

* Removed_Floor_Food

* RIP_Floorfood

* [ci skip] Automatic changelog update.

* briefcase cuff-to-wrist functionality + storage locking + storage key (#31285)

* briefcase cuff-to-wrist functionality + storage locking + storage key

* remove chatmessage

* in which i commit crimes against OOP

* added uncuffing

* Sasha no longer looks like Ian when in the hands of someone (#31286)

* fuck (#31292)

* Tackling tweaks (#31295)

* [ci skip] Automatic changelog update.

* removes unnecessary comma (#31296)

Co-authored-by: ancientpower <[email protected]>

* Island Station Release Candidate (#31281)

* Island 1.0

* release candidate island2

* release candidate island3

* release candidate island4

* osha and health department compliance

Co-authored-by: Damian <[email protected]>

* [ci skip] Automatic changelog update.

* [MDB IGNORE] Basic directional access, makes medbay/sorting doors use it (#31211)

* Basic directional access, refactors medbay doors to use it

* Rest of the maps

* Airlock electronics support

* Slight fix

* Tidying up airlock list

* Placing buttons back

* Half of maps with doors modified

* Rest of maps

* Reverting this airlock electronics reformat for now, save it for another PR

* Adding better windoor support

* Works like this

* So that this can work in a rotated vault

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Player spawn reworks (#31104)

* Player spawn reworks

* Moving roundstart rulesets to this part of proc

* Fixing latejoin spawns too

* Removing wizard mob pre spawn items properly

* Fix

* Strip and delete reworks

* Strip and delete reworks

* Fix

* More of these

* Rearranging this so job assignment happens after role stuff

* Here too

* Reworks silicon roundstart spawn

* Fix I guess

* Unneeded now

* Standardising this

* Standardising and greatly slimming down wizard equip code, finally converted to outfit datum usage

* Redundant

* Even more

* Probably don't need this anymore

* Even more

* Moving this to pre setup, now an actual use for it

* Removing redundant spellbook

* Better to have the teleport in the rulesets rather than the role imo

* Removes silicons from the cube, what a shame

* Nicer

* Now ACTUALLY moving the new player before it becomes an AI

* Fixing runtime

* Moving this here too

* Better way of doing it

* Now works

* Nukie rework

* Here too

* Compile fix

* Logic fix

* And here

* And malf fix too

* Runtime fix?

* Ninja fixes

* Time agents and prisoners

* Raiders

* Last fix

* Probably the easier way after all

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Zam Foodery Update and Condiments Deluxe (#31282)

* Zamfood_Update_and_Zam_Condiments

* DOH

* zamspicy_is_zamspicytoxin

* Hotter_Spicy_Sauce

* Added_Spicy_Sauce_To_Stok_Jerky_Zamitos

* ZamSnax_Spicy_Sauce_Slightly_Reduced

* [ci skip] Automatic changelog update.

* Fixed island next_map datum

* Fixed the soulstone code not preventing shading when a cultist captures a non-cultist (#31308)

* Fixed the soulstone code not preventing shading when a cultist captures a non-cultist

* derp

* Fixes bleeding being broken for real this time (#31299)

* fixes bleeding being fucked for real this time

* additional fixes

* also fixes insane formatting

* more fixes

* also fixes internal bleeding

* wrong numbers

Co-authored-by: ancientpower <[email protected]>

* adds sleeps to coinflip to fix animation (#31305)

* adds sleeps to coinflip to fix animation

* illegal numbers begone

* how did this work in the first place

* put custom pizza in the pizza box (#31314)

* [ci skip] Automatic changelog update.

* [ci skip] Automatic changelog update.

* Fixed several vault-related bugs (#31321)

* Map element rotation fixes (#31315)

* Makes vault rotation a blacklist by default

* Makes this 0 by default

* Loading to Z2 with rotation too for testing

* Passes override to admin map element loading on z2 automatically

* Passes it in the right place

* Much saner way to do all this, plus enables some obviously working ones

* More tested vaults

* More that have no problems in rotation

* Mining stuff that can

* Snaxi stuff that can

* Two that can rotate

* Logging fix

* More detail

* Fixes terminals not rotating properly

* Makes these rotatable too, no issues

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Island fixes (#31349)

* Island Post Release fixes

* Island Post Release fixes

* Island Post Release fixes - roid exapanded

* Island Post Release fixes

* [ci skip] Automatic changelog update.

* Yet another attempt at fixing the missing scrollbar for admins (#31348)

* "Fixes" create-datum verb (#31324)

* debug

* F

* F2

* F3

* Islandstation surfacing (#31323)

This adds IslandStation to the CI, which is needed.
I don't think this would fix it making not votable, though.

* Island Fixes Round 2 (#31352)

* Island Fixes Round 2

* Island fixes

* Island fixes

* Island fixes - pop higher

* [ci skip] Automatic changelog update.

* Moves auxtools_path to early_init (#31353)

* Moves auxtools_path to early_init

* lol

* Maybe fix dynamic picking people it shouldn't be picking. (#31357)

* fuggie

* this too maybe

* [ci skip] Automatic changelog update.

* Island fixes - fun (#31354)

* [ci skip] Automatic changelog update.

* theoretically fixes crewwiz without any unforeseen consequences (#31371)

* theoretically fixes crewwiz without any unforeseen consequences

* other way

* weigh-in from shifty

* weigh-in from Zth

* [ci skip] Automatic changelog update.

* Improved auto-deadmin (#31373)

* Fixes in-game map renderer (#31364)

* Island fixes yet again (#31361)

* Island fixes

* Island fixes chef crate

* Island fixes med shuttle area

* Island fixes

* Island fixes

* Island fixes

* Island fixes

* Island fixes - IAA office

* Island fixes

* Island fixes

* [ci skip] Automatic changelog update.

* Fixed latejoin traitors not getting uplinks (#31391)

* [ci skip] Automatic changelog update.

* Default religion voice fix (#31401)

Co-authored-by: SECBATON GRIFFON <sage>

* [ci skip] Automatic changelog update.

* Fixed baseball bat not updating throw UI button (#31406)

* Fixed mapped intercoms being on the common frequency (#31392)

* Improved vox raiders timer display (#31394)

* [ci skip] Automatic changelog update.

* Ethylredox stops slurring when consumed (#31384)

* Various Cult fixes (#31383)

* Adds reverb sound effect for drugs (#31380)

* Add reverb sound effect for drugs

* More life and sound changes

* Admins can now spawn cosmetic blood stones (#31378)

* Admins can now spawn cosmetic blood stones

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

* Update code/modules/admin/topic.dm

* Update code/modules/admin/topic.dm

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

* [ci skip] Automatic changelog update.

* Enhanced Trusty Tea (#31370)

* Enhanced_Trusty_Tea

* Tweaked_Description

* How_Did_I_Miss_That

* Mothership_Broth_and_Cheesy_Versatility (#31368)

* [ci skip] Automatic changelog update.

* Allows "peeping" through holes in walls (#31333)

* Peephole branch

* Trying new way to control these walls

* Now works mostly ideally

* Sanity?

* Fixes

* New checks

* Removes control datum altogether, this works much nicer

* Removes control datum altogether, this works much nicer

* Some sanity

* Changes

* Better peep hole icon

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* (Revival) Mining bar (#31284)

* Starting rework of this

* Slight fix

* Fixing compile issues

* Updating more code

* More updates

* More updates

* Proper name

* Removing unused comsig file

* Fixing up map

* Makes components work

* Make this show up

* Specific type, maybe?

* Vault fixes, plus makes component actually process

* Say proc finally works with events now

* Calling in wrong registered thing

* Unneeded

* Ports hearing to hear component

* Area exit phrase for him too

* Actual event

* Testing this out for fun

* Some more

* Compiles

* Path

* Disambiguates this

* No more runtiming

* Some cleanliness

* Makes this parsing less rigid

* This too

* Much much less rigid

* This shouldn't be in this then

* Make it rotate

* Here

Co-authored-by: kanef <[email protected]>

* (Revival) Mini-station vault (#31278)

* Revival: Mini-station vault

* Compile fixes

* Major update

* Extra tools

* More

* Last area

* Miners

* Area colours

* Rerouting halls, some fixes, shuttle destination disk

* Area fix

* Spacier hallway

* Adding missing lattice

* Adding lightswitches

Co-authored-by: kanef <[email protected]>

* Adds speaker tags to tape recorders. (#31350)

* [ci skip] Automatic changelog update.

* Better airlock electronics UI (#31376)

* Beginning of this

* Some fixes

* Now has div rows

* Finalised colour

* Some streamlines

* Removing unnecessary space

* More legible input

Co-authored-by: kanef <[email protected]>

* Grayy Soldier and Leader Helmet Sprite Updates (#31359)

* Grayy_Soldier_and_Leader_Helmet_Updates

* Fixed_Tiny_Inconsistency

* [MDB IGNORE] Reinforced floor tiling (#31366)

* Reinforced floor tiling

* Floor tile consistency stuff

* Nicer overlay

Co-authored-by: kanef <[email protected]>

* (Revival) Improved SAMMIs (#31280)

* (Revival) Improved SAMMIs

* Linters

* Adding icons back

* Fixes

* Removing redundant code

* Nicer like this

* Making OOP less bad

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* [ci skip] Automatic changelog update.

* Better Bunsen (#31063)

* [ci skip] Automatic changelog update.

* Makes bananium floor sounds varedit-able (#31385)

* Makes bananium floor sounds varedit-able

* Proper syntax

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Box tweaks, bug fixes etc. (#31389)

* box update

fill later

* finished testing

* [ci skip] Automatic changelog update.

* Revert "Adds reverb sound effect for drugs (#31380)" (#31414)

This reverts commit 1f58e1e.

* Food press (#31400)

* adds food press to condense goofcooking machines

* replaces goofcook machines on all maps with foodpress

* remove comment

* [ci skip] Automatic changelog update.

* Island: Better kitchen/hydro (#31403)

* Island: Better kitchen area

* it's done

* cleaned up details

* thred feedback first pass

* feedback second pass

- cyborg charger in wash room
- more open top wall in diner
- ranch now full windows for easier B&E
- cooler freezer door
- dan machines outside the kitchen

* nice when the kitchen shutter buttons actually work

* 3 shutters

* hide ventscrub

* cameras and lights pass

* even more windows

* food press

* [ci skip] Automatic changelog update.

* Adds common filter input function (#31246)

* Adds common filter input function

* Comment

* 2 more places replaced in too

* Mass delete in zone lines trimmed down now

* Changing function on mass modifying vars

* Reformats this to be more flexible

* Cuts this down too

* Loadout selection

* Nicer to have this be a default value of 0, may as well sneakycode this now

* Handling this in another PR anyways

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Pod Station Tweaks (#31390)

* Pod_Station_Tweaks

* Added_Another_Empty_Cell

* Added_A_Newspaper_To_The_Garbage

* [ci skip] Automatic changelog update.

* Improved baseball bat throwing logic (#31408)

* Improved baseball bat throwing logic

* sportiness affects batting skill

* Fixed Vox Simple Mobs in space suits dying to cold temperatures (#31417)

* More map fixes (Roid, meta, deff, packed) (#31418)

* ok try this

fuck

* finished testing

* unatomic

* uuuuh

* [ci skip] Automatic changelog update.

* Zamitos_Spicy_Stok_Jerky_Tweak (#31419)

* [ci skip] Automatic changelog update.

* Shorter Island Bridges (#31425)

* Shorter Bridges

* Shorter Bridges

* Shorter Bridges

* [ci skip] Automatic changelog update.

* You can no longer keep spawning hand labeler rolls out of thin air after removing its roll from a labeler once (#31426)

* Cleaned up hand labeler roll reference on roll removal

* hold up what am I smoking here

* oh god it's some really bad stuff

* [ci skip] Automatic changelog update.

* AIs can right click again (#31415)

* AIs can right click again

* Forgot this

* Cleanup

* Revert "Yet another attempt at fixing the missing scrollbar for admins (#31348)" (#31432)

This reverts commit e376866.

* Mid-round/latejoin antagonists: Pulse Demons (#31159)

* Beginning work on these

* Area set

* Including

* Indent fix

* Should fix

* Tweaks

* Go through walls hopefully now

* Properly

* Now they can leave

* Indent

* Actual indent

* More stuff

* Moving this out

* How

* Living checks too so it doesn't get ghosts

* Somehow I forget ..()

* Tweaks, hopefully makes powernet visible

* Some new stuff and tweaks

* Role and objectives, plus moving this to role anyways

* Attempt at the ruleset now

* Moving update here, might help

* Indent

* Proper path

* Better logic

* Sanity

* Fixes?

* Proper logo and formatting

* Making this less of a fixed amount
!

* Typo

* Adding the actual ability to hijack an APC instead of automatically getting it

* Fixing format

* Reordering

* Maybe this?

* Placeholder health bar and etc.

* Beginning work on spells

* Actual file

* Actually spawns the lightning, plus weaker version of overload for the pulse demon to use

* Do it some other time

* No need for machines honestly

* Make these immune to environmental stuff

* Basis of a fun proc with fun ideas

* Bunch of fixes, no longer die in APC

* Fix for this last thing probably

* More sanity

* Move down to machine level for more fun

* Testing it with cameras

* Indentation doing it again

* Vision tweaks, bones of arcade fun

* Adding actual threat

* More arcade support

* Link it up

* Indents again

* Fix

* Actual spell icons

* Sanity

* Indenting AGAIN

* Maybe this

* Another try

* Bracket fix

* Bracket fix

* Maybe it's this

* More fixes and tidies

* Spell info

* Spell master for this

* Adds charge to HUD

* Max charge too

* Typo

* Now actually adds it

* Nicer format

* Stat panel

* Battery sucking in practice

* Typo fix and trailing return removed

* APC cells too

* Weapon possession

* Robot possession

* Robot possession actions

* Makes repossessing easier, TODO: Some method to de-compromise them

* Visible hijack feedback and sanity

* Emagging pulse demon spell

* More checks and clarification

* 2 new ones

* Type fix

* Draining tweaks

* More of them

* Makes spells drain charge on use, and unusable without enough charge

* Bones of spell purchasing, probably mostly finished by now

* More sanity and cleanliness

* Spell menu now works, some upgrades

* More stuff, tweaks

* Power buying now fully works

* Tile checking, nerfs shocking mobs

* Moving this back

* Two new powers

* Fixing icon states

* Compile fix

* Better icons

* Compile

* Basis for upgrades

* Neater menu

* This in here too

* Some functionality tweaks

* Nicer role location

* Reordering

* Icons for power menu

* Ability upgrades, better UI later

* Remove these for now, better system than this some other time

* Readding these, in better form

* Readding their descriptions too

* Max health one too

* Adds feedback on purchase

* Attempting fixing spells not being cast

* Proper icon

* Health UI updating

* Now all spells target properly

* Makes this show up right

* The rest too

* Typo

* Better user feedback

* Getting scoreboard

* Patching these out

* These hotkeys too

* Lot of fixes

* Should let them use doors too

* Gives this an objective

* Fixes the lightning

* Better sound

* Pulse demons can now hijack robot speech

* Old way again

* Making usr into user

* Logic fix

* Cut down lines

* Invert since now true

* Cuts down line length

* Syntax

* Health icon updating

* Proper indent

* This too

* Polishing attack, some nerfs

* Last tweaks

* Maybe now?

* Adds new role objective

* Proper client pref

* Latejoin ruleset too

* Adding admin role panel buttons for ease of use

* Nicer movement procs, and only on z1 cables spawned

* forceMove instead of forceEnter

* Makes these not a magic number

* Fixing runtime on latejoin and actually closes these windows

* Revert "Fixing runtime on latejoin and actually closes these windows"

This reverts commit 640b1a6.

* Fixing runtime

* This too

* Better like this

* Cell charger hijacking

* And it rigs the cell too!

* Just in case

* Fixes var type

* The basis of this

* Slows down if not on cable if can leave too

* Actual spell now

* Probably better

* Capitalises

* Period

* Spell icon for this

* Nicer system

* Removing last remnants of old one

* And this

* Disabling this for now, won't compile

* This goes too

* Makes this power actually work

* Converts these to a datum, easier to maintain

* Nicer system

* Usr lets us have this again I guess

* Comments and finishing touches

* Adds some pulse demon wail sounds

* And REMOVES the ones reaper generated in place to base these on

* More obvious death

* Last fix

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Adjust island station minimum players for vote

* [ci skip] Automatic changelog update.

* Urgent pulse demon fixes (#31442)

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* fix broken airlock slicing (#31447)

* fix broken airlock slicing

* sneaky unatomic change (don't tell anyone)

* [ci skip] Automatic changelog update.

* Update miscellaneous.dm (#31420)

* [ci skip] Automatic changelog update.

* Turning a wheelchair into an assembly no longer makes it lose its motorization and such (#31396)

* Turning a wheelchair into an assembly no longer makes it lose its motorization and such

* preserve instance

* unlock atoms

* Add new wrapping junction disposal sprites (#31398)

Co-authored-by: Intigracy <[email protected]>

* Refactored new AI components (#31421)

* Removed duplicated pipe in synergy's burn chamber (#31424)

* Grey Laborer Helmet Resprite and Suit Tweak (#31443)

* Grey_Laborer_Helmet_Resprite_and_Suit_Tweak

* Added_Shading_To_Back_Of_Helmet

* Small_Flashlight_Tweak

* Fixed_A_Mistake

* Improved_Flashlight_Glow

* [ci skip] Automatic changelog update.

* Gno Gnomes (#31461)

* Gno Gnomes

* no schizos either

* [ci skip] Automatic changelog update.

* missing wire under kitchen door (#31475)

* Approximately the same (#31468)

* Makes red crowbars sound more accurate (#31254)

* Makes red crowbars sound more accurate

* Actual sounds too

* Tweaks

* Makes this better

* Much saner

* Move this here

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Grayy_Laborer_Helmet_Resprite_Pt2 (#31462)

* [ci skip] Automatic changelog update.

* Updated Island - Pods-Maint-Bridge changes (#31485)

* Updated Island - Pod-Maint changes

* Updated Island - Pod-Maint changes

* Updated Island - Pod-Maint changes

* Updated Island - Pod-Maint changes

* Updated Island - Pod-Maint changes

* Updated Island - Pod-Maint changes

* [ci skip] Automatic changelog update.

* the purg3 means no rules

* Removes the gnome again (#31503)

* gnome

* bye gnomes

Co-authored-by: PavelCIA <bane>

* [ci skip] Automatic changelog update.

* No MoMMis or AIs on purge day (#31511)

* No MoMMis or AIs on purge day

I should care more about code quality but it's the epic meme day after all!

* Update verbs.dm

* Update mommi_spawner.dm

* no weighted votes

* Revert "No MoMMis or AIs on purge day (#31511)" (#31513)

This reverts commit 405c4e5.

* Command level SPS (#31329)

* Command level SPS

* Makes security alerts computers say it louder

* Puts into practice

* Makes it do this instead

* Check this too

* Fix

* Saner check

* Added april fools icon

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Revised space ninja (#31463)

* Revised space ninja

* Don't add the same shuriken twice to the list

* Medical Maint tweaks (#31467)

* maint update

fsdvw

* area tweaks

* Update tgstation.dmm

* whoops

* cig

* [ci skip] Automatic changelog update.

* SaMMI fixes (#31477)

* SaMMI fixes

* Preserved ghost stuff

* Removing pointless fix

* Missed a line

* Actual fix

* Stop SaMMIs bumping open doors

* Typo fix

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Pressure valves (#31484)

* Add manual and digital pressure valves
Valves that open if the side input has high (or low) enough pressure.
Next up, AAC stuff

* Add manual and digital pressure valves
Valves that open if the side input has high (or low) enough pressure.
Next up, AAC stuff

* Radio and AAC stuff.
Next up, testing and bugfixing, starting with:
* The new AAC automations don't show up on the AAC??? I can import and export them fine, and they DO work, they just... refuse to appear on the list of available automations. As far as I can tell the datum's mere existence seems to be enough for inclusion, there's no secret list on some obscure file
* ??? (TBD, and hopefully none!)

* Finishing touches I guess
Fixed gremlin tampering probability, removed the power check cause turns out they already do that by themselves, and gave valves an extra overlay so you can tell they're enabled. AAC issue got fixed after clearing cache, f*** you BYOND.

* Update code/ATMOSPHERICS/components/trinary_devices/pressure_valve.dm

Co-authored-by: Exxion <[email protected]>

Co-authored-by: Exxion <[email protected]>

* Syndie scoreboard stuff (#31446)

* syndie scoreboard stuff!

+ Syndicate code phrases are now always printed on the scoreboard
+ If explosive implants were used, their activation phrases are printed on the scoreboard

* blessing from the italians

* that if shouldn't be there but i dunno how to fix the ❌

* count phrases, show on count

* keepin' it real

* another blessing from mussolini

* missed one

Co-authored-by: DamianX <[email protected]>

* Update code/modules/mob/living/say.dm

Co-authored-by: DamianX <[email protected]>

Co-authored-by: DamianX <[email protected]>

* Adds corn oil vat to metaclub maintenance (#31505)

Co-authored-by: PavelCIA <bane>

* Fixes shuttle_act gibbing astral projections (#31506)

Co-authored-by: kanef <[email protected]>

* Mining bar fixes (#31507)

* Mining bar fixes

* This too

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* New map: Line Station (#31404)

* Add files via upload

New take on old maps featuring long hallway, loaded with familiar vaults, departments modified to fit more snugly together. I haven't included the .dm file, but I've provided this for review before it's actually played.

* New Map: Linestation

[general]
- Updated based on feedback and minor sanity improvements.

* New map: Linestation

[general]

- Feedback changes and minor sanity updates
- I keep messing this up

* New map: Linestation

[general]
- Add ricochet weapons, Roid virology
- removed stuff still hidden under scrubbers, connected some vents
- filled void left by xoq virology to dump in some deff maintenance

* New map: Linestation

[general]
- some wiseguy flipped the scrubbers and vents on me

* New map: Linestation

[general]
- some wiseguy flipped scrubbers and vents on me

* oops

* New map: Linestation

[general]

- Not sure how to check if the one I uploaded to the wrong place was the most recent. In any case, this one has the most up-to-date changes. I hope the constant uploads aren't an issue

* Frankenline

[general]
- Rearranged kitchen and bar
- Added some maint loot and minor fixes

* Delete linestation.dm

* Updated and play-tested

[general]

- Potential to-do: rearrange the zoo and hydroponics to better connect with the kitchen (easier fridge access)
- figure out why maintenance lacks air (???). There are no unsimulated or airless tiles anywhere, nor missing floortiles.
- Relabel some cameras

At this point it's playable. The air in maintenance comes back relatively quickly, so you can maint crawl without dying.

* Ready

- Lots of small fixes
- With help of Veers, the pressure problem in maintenance is fixed
- cameras relabelled
- Should be ready to play for all roles, but I'll still take feedback and modify, especially with maintenance tunnels.

* Add line to next_map.dm

- self-explanatory

* added "line"

* Oops, actually added line

* Modified to be minimum population of fifteen

- As recommended by Shifty

* Signs

- Added six signs to tell you the direction for departments, and the location of escape, if you are lost.
- Added some wires
- Fixed three low pressure tiles

* this shouldn't be here

* Fixed cargo shuttle overlapping maint

* Kitchen APC was not connected to wall for unknown reason

* Minor aesthetic changes

Decals, camera networks, switched the boom boom rooms back (to original roid brig), made the store a little bigger

* Added some MULE delivery spots and reorganized engineering

* Trader Feedback and morgues

- Rearranged the trader outpost based on feedback. May still need SOUL.
- Added ghetto morgue
- Fixed medbay morgue airlocks
- Removed laser pistols and ricochet lasers from the armory
- Will keep regularly updating until this is merged

* Updates

- added some fire extinguishers
- fixed cargo delivery
- removed a redundant maint APC
- added telecomms disposal
- added extra docking for traders
- fixed trader transit

* Minor updates

- added tanks
- exterior reinforcement
- fitness floor
- EVA shock grilles

* tear gas grenades (#31441)

* GYEAS grenade

* GYEAS grenade box

* GYEAS grenade placement 1

* GYEAS grenade placement 2

* GYEAS grenade placement 3

* frick he's right

* ok fine

* how did i miss this

* never mind i liked a full box

* [ci skip] Automatic changelog update.

* [ci skip] Automatic changelog update.

* fixes linestation compile (#31514)

* Sends info about banned account cookies and multikeying to admin chats (#31409)

* Sends information about banned account cookies and multikeying to admin chats

* Much saner

Co-authored-by: kanef <[email protected]>

* Fixes MoMMIs not being able to ventcrawl (#31540)

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Line updates (#31528)

* Add files via upload

New take on old maps featuring long hallway, loaded with familiar vaults, departments modified to fit more snugly together. I haven't included the .dm file, but I've provided this for review before it's actually played.

* New Map: Linestation

[general]
- Updated based on feedback and minor sanity improvements.

* New map: Linestation

[general]

- Feedback changes and minor sanity updates
- I keep messing this up

* New map: Linestation

[general]
- Add ricochet weapons, Roid virology
- removed stuff still hidden under scrubbers, connected some vents
- filled void left by xoq virology to dump in some deff maintenance

* New map: Linestation

[general]
- some wiseguy flipped the scrubbers and vents on me

* New map: Linestation

[general]
- some wiseguy flipped scrubbers and vents on me

* oops

* New map: Linestation

[general]

- Not sure how to check if the one I uploaded to the wrong place was the most recent. In any case, this one has the most up-to-date changes. I hope the constant uploads aren't an issue

* Frankenline

[general]
- Rearranged kitchen and bar
- Added some maint loot and minor fixes

* Delete linestation.dm

* Updated and play-tested

[general]

- Potential to-do: rearrange the zoo and hydroponics to better connect with the kitchen (easier fridge access)
- figure out why maintenance lacks air (???). There are no unsimulated or airless tiles anywhere, nor missing floortiles.
- Relabel some cameras

At this point it's playable. The air in maintenance comes back relatively quickly, so you can maint crawl without dying.

* Ready

- Lots of small fixes
- With help of Veers, the pressure problem in maintenance is fixed
- cameras relabelled
- Should be ready to play for all roles, but I'll still take feedback and modify, especially with maintenance tunnels.

* Add line to next_map.dm

- self-explanatory

* added "line"

* Oops, actually added line

* Modified to be minimum population of fifteen

- As recommended by Shifty

* Signs

- Added six signs to tell you the direction for departments, and the location of escape, if you are lost.
- Added some wires
- Fixed three low pressure tiles

* this shouldn't be here

* Fixed cargo shuttle overlapping maint

* Kitchen APC was not connected to wall for unknown reason

* Minor aesthetic changes

Decals, camera networks, switched the boom boom rooms back (to original roid brig), made the store a little bigger

* Added some MULE delivery spots and reorganized engineering

* Trader Feedback and morgues

- Rearranged the trader outpost based on feedback. May still need SOUL.
- Added ghetto morgue
- Fixed medbay morgue airlocks
- Removed laser pistols and ricochet lasers from the armory
- Will keep regularly updating until this is merged

* Updates

- added some fire extinguishers
- fixed cargo delivery
- removed a redundant maint APC
- added telecomms disposal
- added extra docking for traders
- fixed trader transit

* Minor updates

- added tanks
- exterior reinforcement
- fitness floor
- EVA shock grilles

* Minor fixes after the playtest

- removed barrier from hos office
- cargo conveyor
- xray camera for AI for AI Upload
- switched out firelocks near arrivals
- removed punching bag next to bridge (formally was gnome)
- overflow surgery fixed
- fixed morgue access
- fixed mech bay wall

* Updates to line

- removed barrier from hos office
- cargo conveyor
- xray camera for AI for AI Upload
- switched out firelocks near arrivals
- removed punching bag next to bridge (formally was gnome)
- overflow surgery fixed
- fixed morgue access
- fixed mech bay wall
- fixed chemistry vents
- fixed floating bulb in chapel
- fixed glass near MiniSat
- fixed genetics access from maintenance
- removed sulfuric acid tank near atmos

* update line

fixed vent

* Another update

- security maint access changed
- removed redundant APC from dorms

* Updated line

- cargo vendor firelock
- slug room increased in size
- removed the nanomed under the door

* retard-proofing singulo

* updates

- Changed paramed station to have circuitboards rather than telesci already set up. Makes parameds put more effort into doing their job.
- Changed bar layout based on feedback
- fixed Vox outpost

* incinerator pipes

* [ci skip] Automatic changelog update.

* Goes in the box (#31550)

Co-authored-by: Cyadox <[email protected]>

* [ci skip] Automatic changelog update.

* Snaxi fixes (#31554)

* Snaxi fixes

Going through some snaxi issues.

- Added wire to connect atmos APC
- unloading streamlined #31543
- borer vent fixed #31499
- traders get proper outpost vending
- vox raiders #28549

* Update snaxi

- fix corners
- fix conveyor

* [ci skip] Automatic changelog update.

* Bring back TRUE democracy (#31551)

Democracy is not the tyranny of the majority. Never has been, never will.
Democracy is about protecting the rights of the minorities while ensuring the governement works for everyone.

We MUST fight for the rights of indigenous meta-voting PoC (People of [map] choice). The future cannot be all Box, Roid, and Box again.

Weighted voting works in such a way that if, globally, 20% of people vote for Packed, Packed will be played, on average, 20% of the time. This is true fairness.
Absolute voting means that if, globally, 40% of people vote for Box, 39% for Roid and 21% for Packed, Box will be voted 100% of the time.

This is absolutely unfair and a real danger to map diversity, ~~equality, and inclusion~~.

:cl:
- rscadd: Bring back weighted voting.

* [ci skip] Automatic changelog update.

* Transit tube update part 1: Construction/access/optimisations (#31397)

* Most of the work on transit tube item construction

* Plus new files

* Sanity

* More sanity

* Anchoring on dismantle, construction tweaks

* Pods do not need to be anchored at all, why

* Orientating these the proper way around, whoops

* Speeding this up a bit, they're way too slow as of now

* Redoing icons, gutting corners altogether

* Removing now unused D- direction stuff, adding sound to station doors opening and closing

* Makes stations require airlock electronics

* Actual implementation

* And finished up

* Access requirement for leaving too

* Mapping these in practice

* Formatting fixes

* Fixing dirs

Co-authored-by: kanef <[email protected]>

* Baseball bat balance (#31399)

* adjusts baseball bats

* changes plank requirement

Co-authored-by: ancientpower <[email protected]>

* Makes time agents a latejoin ruleset too (#31449)

* Makes time agents a latejoin ruleset too

* Fixes them showing up as a latejoin spawn in manifest

* No magic numbers

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* [Revival] Radio jammer traitor item (#31508)

* implemented radio jammer

* Fixing old path

Co-authored-by: Tehsapper <[email protected]>
Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* [MDB IGNORE] Moves random borg upgrades from old trade vendor to trade window (#31510)

* [MDB IGNORE] Moves random borg upgrades from old trade vendor to trade window

* Fixing copy paste error

Co-authored-by: kanef <[email protected]>

* Update minimum players to 20 for line (#31532)

* Stops new vaults rotating (#31538)

* Stops pod station rotating

* Door issues stop this

Co-authored-by: kanef <[email protected]>

* Dec 06 updates for line (#31544)

* Dec 06 updates

- mining ore stacker potentially fixed
- docking for salvage shuttle potentially fixed
- changed grilles in hall to glass
- EVA rearranged
- xenobiology fixed

* Plasmaglass looks better and lasts

* Added APC

- Changed area to something else... Maybe only a temporary fix

* stacker

- fixing the mining stacker broke the recycling stacker (fixed both now)
- redid a little maint areas

* Update line.dmm

- added one piece of missing maint pipe
- added floor underneath jannie door

* Update snaxi

- changed corners on pods/shuttles
- changed conveyor on supply shuttle

* Delete snaxi.dmm

* Revert "Delete snaxi.dmm"

This reverts commit 5c40fb3.

* Revert "Update snaxi"

This reverts commit decece3.

* Update line.dmm

- Added maint room from Kromkar

* Update line.dmm

- Added some posters

* Update line.dmm

- Added notice board
- moved ghetto bar intercom
- switched a one-way window for a regular one

* Update line.dmm

- Added a windoor for the barkeeper so they can feel more indpendent

* Voting cancelling clarification (#31556)

* Voting cancelling clarification

* logs

* Update voting.dm

* adds radio usage to logs (#31557)

* Waystation fixes (#31560)

Went through the mapping issues for waystation.

- added engineering request console. Closes #31185
- bridge fire extinguishers. Closes #31171
- fixed air mix frequency. Closes #30986
- added lighting in medbay, brig, and escape (mostly related to europa lights). Closes #30741 and #30582
- Added telecomms access (Closes #30730
- I suspect the issue with the R&D server room air alarm could be because of temperature possibly increasing?... I replaced the nitrogen with plasma for better cooling. I also did this for the main telecomms. Closes #30435
- moved table (Closes #30398)

* [Revival] Deep Space Exploration System (#31509)

* [Revival] Deep Space Exploration System

* Forgot this file

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Removes old trade vendor from line (#31566)

* Removes old trade vendor from line

* What were you doing here???

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* Adding DSES icon (#31572)

Co-authored-by: kanef <[email protected]>

* [ci skip] Automatic changelog update.

* yes weighted voting

* Fixes Eye Surgery (#31567)

* An ancient evil sleeps once more

* stupid whitespace

Co-authored-by: Cyadox <[email protected]>

* Dec 10 Line update (#31581)

* Dec 10 Line update

- singulo telescreen
- windoor robotics for mechatronics engineer
- arrivals above shuttle missing some wall
- morgue access
- brig blast doors maint
- eng pumps 31576
- vent 3 perma 31570
- genetics maint needs access restriction
- Switched out double-glass doors for singles. I think they may be causing ventcrawlers to fall out of the pipes

* Update

- fixed derelict smelter
- removed prison blast doors that weren't used... may re-add them again

* Update line.dmm

- Fixed an APC and pipe

* Update line.dmm

- added sound systems

* [ci skip] Automatic changelog update.

* Removes cringe (#31598)

Co-authored-by: SECBATON GRIFFON <sage>

* [ci skip] Automatic changelog update.

* Fixes grinch (#31590)

* Fixes grinch

* Fixes grinch

* Fixes tag mode (#31589)

* adds shorthands for long emotes + does other stuff (#31594)

* dfkjfhdsrdfhslkahdflksahdfrlka

* VDSGJHADFBSKJFBGSKJFCSAK

* efrewr

* she uppercase

* [ci skip] Automatic changelog update.

* Slightly desouls the Atmos hardsuit sprite (#31541)

* Atmos suit update

* whoops forgot this.

* Cult 4 changes (#31562)

* Cult 4 changes

Removal of the Roman numbers
Conceal Rune no longer makes a sound
Increased cost to draw a rune(wip)

* Roman

* Not yet

* ooops forgot one

* Custom painting revival (#31563)

* First steps. Template and some BYOND-side work

* Change of plans, fuck NanoUI, we html_interface nao.
Canvas painting code moved to it's own .dm, .tmpl split into .tpml and .js.
You can use a pen on a canvas to start drawing, can't save your drawing yet but it loads whatever data was already in there.
So far so good.

* Tweaks nanotrasen.css cause it SUCKS.
Link buttons behave like shared.css', and text inputs look better (that border had no business being so thick).
TODO: Check the MSGS' _UI cause it had a button input that looked like ass because of the CSS applying to all inputs

* UI and UI code overhaul. Topic receives data.
TODO: clean up UI code, It's a mess. paintTool.js should probably get split up further, separate the painting from the blending modes or something.

* Sanity, saving, description, and href-multi integration

* Yay, procastrination. Also, split UI and Topic logic into reusable datum separate from object, and some more sanity.
I really should get to the "display the painting in-game" part at some point

* IT WORKS! Paintings are showing up in game.

* Crayons! And pens and color and stuff

* Soap to clean/blank, and moving "Title" before "Author" on UI

* Couple fixes

* Paint brushes! Icons may need replacing, specially inhands

* Cyan paint bucket. UPDATE WIKI: SUPPLY PACKS

* Container fix. Picking a human's blood color as paint is funny, but weird

* Can't quite remember what I was up to last time, moved files to their own folder on /module I guess. Just, getting my stuff out there for a PR

* Supply crate and Eneocho's glass idea

* fugg

* Color transparency and movement throttling

* Hair dye spray cans.
Outperformed by rainbow crayons, those get two colors on top of the picker. Should implement brush size to give them an actual advantage. Maybe stronger paint?

* Fixes a couple oopsies after rebasing to (as of writing) current Bleeding Edge

* new icons

* .dme

* Palette

Co-authored-by: JellyVeggie2 <[email protected]>

* [ci skip] Automatic changelog update.

* December 11 Line update (#31601)

* Update line.dmm

- add some spacepod items
- tweak firelocks Closes #31596
- tweak access on robotics windoor, closes #31597

* tubes

- Added transit tube -- I have no idea how these work

* Faster Tubes

- they're faster but they still don't work properly

* Jesus that ended being far easier than I thought. Literally just a missing 'S'. (#31600)

* kdgahekdgsakdjgadkjas (#31604)

* [ci skip] Automatic changelog update.

* parity with BE

* TGUI fixed

Co-authored-by: PJBot <[email protected]>
Co-authored-by: DamianX <[email protected]>
Co-authored-by: Exxion <[email protected]>
Co-authored-by: DeityLink <[email protected]>
Co-authored-by: gurfan <[email protected]>
Co-authored-by: boy2mantwicethefam <[email protected]>
Co-authored-by: Optimism333 <[email protected]>
Co-authored-by: kane-f <[email protected]>
Co-authored-by: kanef <[email protected]>
Co-authored-by: plosky1 <[email protected]>
Co-authored-by: Apogee-dev <[email protected]>
Co-authored-by: adrian <[email protected]>
Co-authored-by: IThe-TI <[email protected]>
Co-authored-by: jwhitak <[email protected]>
Co-authored-by: 9percents <[email protected]>
Co-authored-by: SonixApache <[email protected]>
Co-authored-by: rob <[email protected]>
Co-authored-by: ancientpower <[email protected]>
Co-authored-by: ancientpower <[email protected]>
Co-authored-by: BurntDevil <[email protected]>
Co-authored-by: Damian <[email protected]>
Co-authored-by: SECBATON GRIFFON <[email protected]>
Co-authored-by: Eneocho <[email protected]>
Co-authored-by: west3436 <[email protected]>
Co-authored-by: Kurfursten <[email protected]>
Co-authored-by: CptWad <[email protected]>
Co-authored-by: PrimeDSS13 <[email protected]>
Co-authored-by: D3athrow <[email protected]>
Co-authored-by: carson wilkinson <[email protected]>
Co-authored-by: Intigracy <[email protected]>
Co-authored-by: PavelCIA <[email protected]>
Co-authored-by: jellyveggie2 <[email protected]>
Co-authored-by: adacovsk <[email protected]>
Co-authored-by: Cyadox <[email protected]>
Co-authored-by: Cyadox <[email protected]>
Co-authored-by: Tehsapper <[email protected]>
Co-authored-by: Brotanics <[email protected]>
Co-authored-by: gallywix4 <[email protected]>
  • Loading branch information
1 parent 40795be commit 83b6f9b
Show file tree
Hide file tree
Showing 1,180 changed files with 3,854,325 additions and 86,881 deletions.
186 changes: 92 additions & 94 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,94 +1,92 @@
name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the Bleeding-Edge branch
push:
branches: [ Bleeding-Edge ]
paths-ignore:
- 'html/changelogs/**'
pull_request:
branches: [ Bleeding-Edge ]
paths:
- '**.dm'
- '**.dmm'
- '**.dmi'
- 'vgstation13.dme'
- '.github/workflows/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

env:
BYOND_MAJOR: 514
BYOND_MINOR: 1566

#This can be declared here because build.py will ignore it if DM_UNIT_TESTS is true.
ALL_MAPS: tgstation metaclub defficiency packedstation roidstation nrvhorizon test_box test_tiny snaxi tgstation-sec LampreyStation xoq boxesstation synergy bagelstation lowfatbagel Dorfstation waystation

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
lint:
name: Run linters
# The type of runner that the job will run on
runs-on: ubuntu-latest
# Don't run this job if the commit message contains that string.
if: "!contains(github.event.head_commit.message, '[ci skip]')"
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.x'

#TODO: Cache Dreamchecker install
- name: Run dreamchecker
run: |
SPACEMAN_DMM_GIT_TAG="suite-1.7" tools/travis/install_spaceman_dmm.sh dreamchecker
~/dreamchecker
- name: Run map checker
run: python tools/travis/check_map_files.py maps/

#TODO: Cache pip directory
- name: Validhunt DMIs
run: |
pip install Pillow
python tools/dmi-validhunt/dmi-validhunt.py icons/ || true
- name: Make sure test maps or vaults aren't ticked
run: find -name '*.dme' -exec cat {} \; | awk '/maps\\test.*|\.dmm/ { exit 1 }'

build:
name: ${{matrix.job-name}}
runs-on: ubuntu-latest
# Don't run this job if the commit message contains that string.
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
include:
- dm-unit-tests: 0
job-name: Compile all maps

- dm-unit-tests: 1
job-name: Compile and run tests

steps:
- uses: actions/checkout@v2

- uses: actions/cache@v2
name: Cache BYOND installation
with:
path: ~/BYOND-${{env.BYOND_MAJOR}}.${{env.BYOND_MINOR}}
key: BYOND-${{runner.os}}-${{env.BYOND_MAJOR}}.${{env.BYOND_MINOR}}

- name: ${{matrix.job-name}}
env:
DM_UNIT_TESTS: ${{matrix.dm-unit-tests}}
run: |
tools/travis/install-byond.sh
source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
tools/travis/build.py 2>&1 | tee /dev/stderr | awk '/warning:|error:/ { exit 1 }'
cp tools/travis/config/config.txt config/
tools/travis/run_tests.py 2>&1 | tee /dev/stderr | awk '/UNIT TEST FAIL/ { exit 1 }'
name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the Bleeding-Edge branch
push:
branches: [ Bleeding-Edge ]
paths-ignore:
- 'html/changelogs/**'
pull_request:
branches: [ Bleeding-Edge ]
paths:
- '**.dm'
- '**.dmm'
- '**.dmi'
- 'vgstation13.dme'
- '.github/workflows/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

env:
BYOND_MAJOR: 514
BYOND_MINOR: 1566

#This can be declared here because build.py will ignore it if DM_UNIT_TESTS is true.
ALL_MAPS: tgstation metaclub defficiency packedstation roidstation nrvhorizon test_box test_tiny snaxi tgstation-sec tgstation-snow LampreyStation xoq boxesstation synergy bagelstation lowfatbagel Dorfstation waystation island line

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
lint:
name: Run linters
# The type of runner that the job will run on
runs-on: ubuntu-latest
# Don't run this job if the commit message contains that string.
if: "!contains(github.event.head_commit.message, '[ci skip]')"
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.x'

#TODO: Cache Dreamchecker install
- name: Run dreamchecker
run: |
SPACEMAN_DMM_GIT_TAG="suite-1.7" tools/travis/install_spaceman_dmm.sh dreamchecker
~/dreamchecker
- name: Run map checker
run: python tools/travis/check_map_files.py maps/

#TODO: Cache pip directory
- name: Validhunt DMIs
run: |
pip install Pillow
python tools/dmi-validhunt/dmi-validhunt.py icons/ || true
- name: Make sure test maps or vaults aren't ticked
run: find -name '*.dme' -exec cat {} \; | awk '/maps\\test.*|\.dmm/ { exit 1 }'

build:
name: ${{matrix.job-name}}
runs-on: ubuntu-latest
# Don't run this job if the commit message contains that string.
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
include:
- dm-unit-tests: 0
job-name: Compile all maps

- dm-unit-tests: 1
job-name: Compile and run tests

steps:
- uses: actions/checkout@v2

- uses: actions/cache@v2
name: Cache BYOND installation
with:
path: ~/BYOND-${{env.BYOND_MAJOR}}.${{env.BYOND_MINOR}}
key: BYOND-${{runner.os}}-${{env.BYOND_MAJOR}}.${{env.BYOND_MINOR}}

- name: ${{matrix.job-name}}
env:
DM_UNIT_TESTS: ${{matrix.dm-unit-tests}}
run: |
tools/travis/install-byond.sh
source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
tools/travis/build.py 2>&1 | tee /dev/stderr | awk '/warning:|error:/ { exit 1 }'
cp tools/travis/config/config.txt config/
tools/travis/run_tests.py 2>&1 | tee /dev/stderr | awk '/UNIT TEST FAIL/ { exit 1 }'
4 changes: 4 additions & 0 deletions SpacemanDMM.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[langserver]
dreamchecker = true

[code_standards]
disallow_relative_proc_definitions = true
disallow_relative_type_definitions = true

[debugger]
engine = "auxtools"
7 changes: 4 additions & 3 deletions __DEFINES/__compile_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
//#define MAP_OVERRIDE 11
// lowfatbagel.dm
//#define MAP_OVERRIDE 12
// island.dm
//#define MAP_OVERRIDE 13
// line.dm
//#define MAP_OVERRIDE 14

// Toggles several features, explained in their respective comments.
// You can turn those on and off manually if you prefer, instead of setting this
Expand All @@ -61,6 +65,3 @@
#define SHOW_CHANGELOG_ON_NEW_PLAYER_LOGIN !DEVELOPER_MODE

#define AUXTOOLS_DEBUGGER DEVELOPER_MODE

//Map-specific defines
#define ROBOT_CHECK "robot check"
20 changes: 12 additions & 8 deletions __DEFINES/_macros.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@

#define isgrinch(A) (istype(A, /mob/living/simple_animal/hostile/gremlin/grinch))

#define ispulsedemon(A) (istype(A, /mob/living/simple_animal/hostile/pulse_demon))

#define isslimeadult(A) istype(A, /mob/living/carbon/slime/adult)

#define isrobot(A) istype(A, /mob/living/silicon/robot)
Expand Down Expand Up @@ -112,6 +114,8 @@

#define isMoMMI(A) istype(A, /mob/living/silicon/robot/mommi)

#define isSaMMI(A) istype(A, /mob/living/silicon/robot/mommi/sammi)

#define isbot(A) istype(A, /obj/machinery/bot)

#define isborer(A) istype(A, /mob/living/simple_animal/borer)
Expand Down Expand Up @@ -212,7 +216,7 @@

#define isrealobject(A) (istype(A, /obj/item) || istype(A, /obj/structure) || istype(A, /obj/machinery) || istype(A, /obj/mecha))

#define iscleanaway(A) (istype(A,/obj/effect/decal/cleanable) || (istype(A,/obj/effect/overlay) && !istype(A,/obj/effect/overlay/puddle) && !istype(A, /obj/effect/overlay/hologram)) || istype(A,/obj/effect/rune_legacy))
#define iscleanaway(A) (istype(A,/obj/effect/decal/cleanable) || (istype(A,/obj/effect/overlay) && !istype(A,/obj/effect/overlay/puddle) && !istype(A, /obj/effect/overlay/hologram)) || istype(A,/obj/effect/rune_legacy) || (A.ErasableRune()))

#define ismatrix(A) (istype(A, /matrix))

Expand All @@ -224,7 +228,9 @@

#define isPDA(A) (istype(A, /obj/item/device/pda))

#define isfloor(A) (istype(A, /turf/simulated/floor) || istype(A, /turf/unsimulated/floor) || istype(A, /turf/simulated/shuttle/floor) || istype(A, /turf/simulated/shuttle/floor4))
#define isfloor(A) (istype(A, /turf/simulated/floor) || istype(A, /turf/unsimulated/floor) || istype(A, /turf/simulated/floor/shuttle) || istype(A, /turf/simulated/floor/shuttle/brig))

#define isshuttleturf(A) (istype(A, /turf/simulated/wall/shuttle) || istype(A, /turf/simulated/floor/shuttle))

#define iswallturf(A) (istype(A, /turf/simulated/wall) || istype(A, /turf/unsimulated/wall) || istype(A, /turf/simulated/shuttle/wall))

Expand Down Expand Up @@ -261,11 +267,7 @@

#define isthrall(H) (H.mind ? H.mind.GetRole(THRALL) : FALSE)

#define isnewcultist(H) (H.mind ? H.mind.GetRole(CULTIST) : FALSE)

#define ischiefcultist(H) (H.mind ? H.mind.GetRole(CHIEF_CULTIST) : FALSE)

#define iscultist(H) (isnewcultist(H) || ischiefcultist(H))
#define iscultist(H) (H.mind ? H.mind.GetRole(CULTIST) : FALSE)

#define isstreamer(H) (H.mind && H.mind.GetRole(STREAMER))

Expand Down Expand Up @@ -339,9 +341,11 @@

#define isspace(A) (A.type == /area)

#define isopenspace(A) istype(A, /turf/simulated/open)

//This one returns the "space" area
//#define get_space_area (get_area(locate(1,1,2))) //xd
proc/get_space_area()
/proc/get_space_area()
//global.space_area is defined in code/game/areas/areas.dm, and set when the space area is created
if(!global.space_area)
var/area/new_space_area = new /area
Expand Down
2 changes: 1 addition & 1 deletion __DEFINES/callback.dm
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Set a callback's thing_to_call to GLOBAL_PROC in order to call a global proc.
#define GLOBAL_PROC "fuck you duny"
#define GLOBAL_PROC "ryll is cool"
Loading

0 comments on commit 83b6f9b

Please sign in to comment.