* hell
* i didnt like the doors
* mapper misses one trim billions must die
* shutter update
* s
* s
* a
* removes maint door
* ctrl Z
* undeletes river
* undeletes rivers area woopsie
* weird
* part 2
* Starts placing ice and snow at evac, makes shuttle dock
* IceMeta dm and json file
* A lot more ice and snow
* two files/?????
* maybe halfway done placing ice if even lol
* more ice. almost done with this LONG ASS PROCESS
* engines, maybe? this will take some testing
* a lotta lotta ice (HOLY SHIT I ALMOST CLOSED MY BROWSER WITHOUT COMMITTING THIS)
* Finishes placing ice and adds genturf around the map
* oops!
* couple little bugaroonies
* some stuff i missed
* some more stuff, mining base is done, added snow to some space i missed things
* stuff
* oops
* Config
* new landmarks
* ioopssie poopsie!!!!!!!!!!!
* forgor
* fmaily guy
* forgot like one or twenty tiles of ice
* Rename the map
* fix that a little
* why was this not here exactly?
* ATV room
* podbay door
* finishes up
* disables meta
* coats, boots and a pickaxe
* i caught you on camera acting sus
* removes bloat bandaid fix
* replaces bloat with not bloat
* finishes fixing that stuff
* oops
* space tile
* Quality issues and makes a cool snow path around the stayshun
* airless turf no bueno
* expand escape shuttle dock
* update meta
* fuck you *steals atmos*
* ye
* plz work uwu
* snow tiles on engine
* jortz
* makes tesla template look much better
* cleans up the outside of the station more
* sussy
* icemoon 2 z levels now
* Revert "icemoon 2 z levels now"
This reverts commit 9a6aaeea2e.
* plz work this time
* fixes json
* why isn't it working
* ned you're fucking retarded
* god fucking damnit ned
* poop
* Revert "poop"
This reverts commit 62cecf79eb.
* ok this time it should work
* one more thing
* fortnite
* rip spacemeta.... you did well
* ned are you fucking dumb?
* what the flip
* a zillion errors
* what the hell was the point of this?
* oops
* axes bloat icemoon maps
* forgot to delete this one lol
* adds joe the goliath to the mining base. super important change
* maybe fixes that? probably not
* fixes 2 runtimes
* fixes another runtime
* fix window
* b
* l
* fixes lavaland spawning
* random maint ruins with space in them suck anyway
* dogshit ass ruins
* fuck you maint ruins
* dilithium spawns now
* fixes KAs again and makes legion damage ignore apply to mining levels again
* b
* left some space
* prolly fixes solars
* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"
This reverts commit 82e3ad1c73, reversing
changes made to 9d918cf020.
* Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta"
This reverts commit 9d918cf020, reversing
changes made to f06088b78b.
* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"
This reverts commit f06088b78b, reversing
changes made to c217b19fcc.
* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""
This reverts commit e4e618015c.
* Revert "Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta""
This reverts commit 6982c478e5.
* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""
This reverts commit 5ea59d7339.
* security interace
* walls instead of windows for the space loop pipes so it's less cancerous in the long run
* Expands mining station atmos a little, shifts some stuff around the mining base in general, adds a heater so the base no longer gets mad chilly
* forgot a decal
* didn't commit it
* y
* ned
* i love this so much!
* brig :)
* L bozo
* THE DECALENING PART TWO: SCIENCE (#2)
* remove tiles
* forgot some red tiles
* farts
* done
* THE GREAT DECALENING PART 3: EVERYTHING ELSE (#3)
* should kill most tile decals
* should finish murdering old ones
* hey buddy you dropped this
* probably finishes killing old ones
* should properly shorten the ones that were done wrong
* maybe shrinks it now
* something went very wrong but i think we are back
* okay is this it
* silly ned
* what the flip
* balderdash
* Revert "balderdash"
This reverts commit 969dc70157342f60ac933f07e2d42eccd14f23e9.
* does like WAY too much stuff to describe
* ALMOST DONE
* ned you suck lol
* L ned + Ratio
* CONCLUDES THE GREAT DECAL-ENING
* few little tweaks
* HoP turnstile, as god intended
* remove free laser gun
* Fix Nukies P1: The Shuddle can drop (someone fix the flattening problems plz)
* Fix Nukies P2: Add plasma cutters and some plasma to the nukie shuttle
* gene wallmed 4 consistency
* fuck update appearance
* make bridge trims a ltitle better
* fuck this shit bro jesus
* i think i forgot this somehow idk
* fuck
* smart feller? no. fart smeller.
* makes engi and atmos way better looking trim-wise
* wait what if that's not actually true at all??
* plz work that'd be cool if it did
* i think this is right
* dumbass ned
* this might work idk
* plz
* Revert "plz"
This reverts commit c13270eb87.
* Revert "this might work idk"
This reverts commit 495db72813.
* Revert "dumbass ned"
This reverts commit cd59b84b9a.
* Revert "i think this is right"
This reverts commit 63a858aedd.
* Revert "plz work that'd be cool if it did"
This reverts commit b332d0f237.
* part 1
* ned is dumb
* part 2
* let me push this probably
* insignificant change to see if it fixes anything
* sick
* i deadass forgot to commit bro
* Revert "i deadass forgot to commit bro"
This reverts commit 986fa06991.
* Revert "Revert "i deadass forgot to commit bro""
This reverts commit 6d7bed5380.
* i hate this game
* n
* h
* h
* L
* cocaine
* that's important
* when you're here, you're family
* you suck eg ned
* starts working on this a little bit
* labor camp pt 1
* part 2
* sick
* it's done
* oops
* docking port
* kill the old one
* probably fixes pods
* finishing touches
* actual finishing touches
* touches up on a few poopy trims
* de-shittify tool storage
* why was this like that
* Aux base works now
* camra
* fixes everything
* a
* scrungularky
* gta 5
* lets see what this breaks
* unbreak the entire map
* does some stuff
* cool
* i think we are in the clear
* stuff, finishes stuff
* cool
---------
Co-authored-by: Byemoh <baiomurang@gmail.com>
* Ports climbable & blocked turf
Adds the climbable element to replace the copy paste code between machines and structures
Ports the code improvements to blocked turf checks, commenting back in its uses that tattax had added but couldnt get functional (fixes ethereal jaunt & hierophant teleporting)
Ports over LADYADDASSOCLIST code improvements, this has no effect in-game and mostly in the codebase, it's only ever used in two other locations total.
Fixes being able to stack several machines on one tile
* fixes climbing on crates
* Update climbable.dm
* merge conflicts r awesome
* SSMetrics
* We were a bit too silly
* Forgot to commit this
* Logs CPU
* Removes global data from all ss
* And puts it on the metrics ss
* Update metrics.dm
* Logs profiler data
* Adds profile configs
* Update code/controllers/subsystem/metrics.dm
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
* Log request errors
* Final fixes
* Rebuilds for 1.2.0-yogs1
* Apparnetly you can't split macro calls on multiple lines
* Org is called yogstation13 not yogstation
---------
Co-authored-by: alexkar598 <>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
* holy fuck it works
* plasma floors and hellfire lasers
* oh god oh fuck
* incendiaries and flaming arrows
* fuel for the fire
* oxygen is not included
* sets off fire alarms
* heavy lasers too
* Update bottle.dm
* update_appearance
* goddamn it john
* FOOD!!!
* maybe this is why they didn't add the ice cream
* requires utility upgrades instead
* whoops
* ok
* why was grippers here
* space
* different
* LORE CHECK LORE CHECK LORE LORE LORE!! I LOVE VUULEKNSS
* cooldown done
* cooldown to default mediborg lollipop speed
* uses cooldown_declare and stuff like that
* space
* fixes plus place on tables and the FLOOR!!
* delete for now so i CAN SYNC
* readd the food
* gumball (non-cyborg version) added
* changes done
* delete this file
* ya deleting files is too hard
* delete all of the old lollipop shooter
* emag functionality
* update TODO comment
* icecream
* thought i removed this, but guess not
* throwforce works now
* wtf icondiffbot?
* just triggering the checks
---------
Co-authored-by: ynot01 <ynot000001@gmail.com>
* Adds twohanded and ports some things to use it
this will require update_appearance to properly compile.
Haven't ran updatepaths yet, I'm just saving my progress.
* Saving my progress again.
* Nearly finished
* Fixes
* test commit
* Revert "test commit"
This reverts commit 6e4e79a57a.
* existing base_icon_state
* base to atom
* Update twohanded.dm
* map updates and updatepaths relocation
* merge conflicts
* Fixes in local testing
* call parent
* fuck you admins have to wait procs out
* wielded stats
* update icon and update appearance
* update name
* fixes
* Removes double parent calls from many things
* More fixes
* minor fixes
* fuck
* A!
* general annoyances in this PR
* going in specific fixes
* remove remaining update icons and hud fixes
* Mass replace update icon with update icon state/overlays
* compile
* push my work so far
* goes back on things I broke
* a
* goes through like 80 more cases
* going through more update icons
* compile again
* thank you tattax
* Goes through the remaining update icon
* fix CI cries
* Fixes cigs, canisters and guncases
* Fixes airlock unres sides
* Fixes the flash
* Fixes cryo cells
* gun fix
* Egun fixes
* fixes mini eguns
* Update energy.dm
* Fixes MMIs
* Fixes security level interface
* Fixes cigar cases
* Bow & Critter crate fixes
* Fixes signalers
* Fix canisters again
* re-adds blinking red
* Fixes solar panels
* Fixes cryogenics (and forced standing)
* Update cryo.dm
* sechailer fix
* Maybe fixes pitch black roundstart APCs
* Update apc.dm
* yet another egun fix
* Fixes plasmamen helmets among other stuff
* Fixes canisters for good
* Fixes booze dispensers
* Fixes new icon updates people added
* Probably fixes ballistic guns
* i give up lol
* Adds grep for mapload and var in Args
* vars in args
* some more
* stuff
* Update shuttle_creator.dm
* Update __techweb_helpers.dm
* fix
* Update discoball.dm
* Update check_grep.sh
* Update check_grep.sh
* Update check_grep.sh
* Update check_grep.sh
* I'll finish this later
* datum and lateinit maploads
* componentinit stuff
* mapload fixes
* why isnt CI catching these major issues
* MERGE CONFLICT FUCKED MY PR OVER
* Update check_grep.sh
* Update food.dm
* Updates our unit testing to be much better than it is now
Updates our unit testing to somewhat more functional ones ported from TG
I also added 2 new unit tests to serve as examples, mapping and job landmarks.
* Revert some minor things
* Fixes the log file
* Update unit_tests.dm
* adds a missing icon
* additional changes
* e
* removes some redundencies
the files deleted are already in the mouse pointer folder
* e
* entertainment
* s
* the plasmaman update
it sucks
* e
* duffalbag
* e
* e
* e
* e2
* e
* Update code/modules/antagonists/space_dragon/space_dragon.dm
* e12
---------
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
* commit 1 - get me out
* she lives
* adds wizards
* thing
* surprise end hits take 1
* s
* d
* surprise end hits take 2
* montreal
* REAl
* strangelight
* guilford fall
* natural disasters
* envelope
* h
* lady elect
* test 321
* test 123
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
* hot toes test
* ss
* redundancy
* s
* test 2
* s²
* s³
* s²³
* a pray!
* life and limb
* epic problem
* hmm
* update
* fixes something
* fixes something²
* adds slaughter demons to the game
* rend it
* hmm
* restores something
* adds clockwork cult into the game
* adds changelings to the game
* cassevetes
* test 101
* :)
* against
* shut the door
* adds darkspawn to the game
* sad
* cashout
* adds vampires to the game
* 2
* summer freeze
* pink frosty
* test111
* adds game to the game
* 2
* syndrome
* test
* test 2
* test 3
* test 4
* adds replay to the game?
* maybe?
* slo
* hrn
* test II
* test III
* test IV
* new technique
* ahm hum
* d
* sensible
* c
* ss13
* a
* v
* f
---------
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
* Murders the old prefixed SQL template
* This no longer needs to exist
* A little refactoring before we do some trollign
* Echelon subsystem
* In hindsight, this shouldn't be here because global variables dont perssist
* Missed a constraint
* Simplifies flag checking logic
* Missed my bloody comma
* Updates outdated comment in config
* Removes the id column and sets ip as the new primary key
* This is embarassing
* Fixes alignment
* Adds round id to ban message
* baby proofs the code
* Oops, can't use it after deleting it
* Changes the ban message so that bans on abusive ISPs make more sense
* Set max version
* Updates most references to .proc (Leaves a couple to check check_grep)
* Actually add check
* Oops
* Hopefully exclude the one place we do want .proc
* AAAAAAA
* Trying this instead
* Hopefully checks go green
* Switch to NAMEOF_STATIC
* Makes 515 acutally build
* LIBCALL
* Big thinks are coming
* extra m free of charge (i don't want it)
* roll it back
* more
* Update holy_weapons.dm
* Update holy_weapons.dm
* Update holy_weapons.dm
* new hammer sprites
* here we GO
* hell YEAH
* sprites
* Update necropolis_chests.dm
* new ability icons
* Update holy_weapons.dm
* tweaks and icon removal
* bit stronger
* less force
* vibrosprites
* dme
* remove the ability if it gets exorcised
* also null the owner
* Update book.dm
* A few SSmapping improvement
* sync1
* try 1
* remove print
* fixed1
* fixed2
* broken1
* fixed3
* use old reader
* clean up
* also remove this debug
* Don't load reebe and arena in low mem mode
* Latest version loader with mapgen fixed
* I missed this part somehow
