cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,285 Commits 21 Branches 0 Tags
ef783cb856f7e01321033a84c2a428601b698da3
Commit Graph

5463 Commits

Author SHA1 Message Date
Byemoh
4a6973a465 Falling into a chasm doesn't delete your body and someone can fish you up (#17723) 
* eeeee

* e

* map

* break

* eeeee

* cope

* Update chasm.dm
 2023-02-09 19:22:03 -06:00
Molti
3e51ef4f8b Update lavaland_surface_maze.dmm (#17846) 2023-02-08 11:39:03 +01:00
Byemoh
1cfbe0fd48 adds det's sunglasses and shit on his desk on gax and other misc stuff (#17748) 
* eeeeeeeeee

* shudders

* readds stuff
 2023-02-07 19:59:54 +00:00
Byemoh
b01613407a Alternate Gax Arrivals design for free miner ship (#17776) 
* Update GaxStation.dmm

* Update GaxStation.dmm

* e
 2023-02-07 11:15:40 +01:00
Byemoh
b2c06b0866 Lavaland Corn Maze Ruin (#17712) 
* eeee

* yep

* Update lavaruinblacklist.txt

---------

Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
 2023-02-06 17:17:05 -06:00
LazennG
85661c5d71 buster arm patch (#17779) 2023-02-05 12:14:18 -05:00
adamsong
a9a485f400 Un-breaks map diff bot (#17762) 2023-02-04 20:15:08 +01:00
Aquizit
2b17639341 sets powered area to outside machines at ai sat maint (#17699) 2023-01-31 15:09:21 +01:00
Jamie D
e758396fce Fixes the Air Mixer for the hundredth time (#17684) 2023-01-28 18:21:47 +01:00
Byemoh
7bc0efbcfc Fixes more boxstation trims (#17668) 
* ggggg

* psych doors

* engineering entrance

* asdasd
 2023-01-28 17:59:08 +01:00
ynot01
4eef4acae8 Science Security & HoS can now enter robotics & xeno (#17663) 
* sec to robo they making gygax

* hon

* breaks everything

* Update access.dm

* Update access.dm

* gives them xenobio too bc jamie said so
 2023-01-27 19:19:02 -05:00
Aquizit
a86abee3b2 Corrects the door to the Service Hall from Hydroponics to only be accessible to botanists. (#17629) 2023-01-24 22:04:23 -06:00
Byemoh
29ce8f8410 cxzdasd (#17630) 2023-01-24 22:16:26 +01:00
DukeBobRoss
de03c05801 Makes asteroid atmos less annoying (#17598) 
* e

* this does the thing

* fixesthosethings
 2023-01-24 22:15:48 +01:00
Byemoh
b6a9711322 [Box] fixes some missing/incorrect trims (#17594) 
* asdasdsad

* asdasdas
 2023-01-22 15:04:47 +01:00
GraveHat
3434229f67 Moves things around, adds things to make seafood themed items to Fishing Biodome (#17382) 
* Fish Freezer, Nettle Seeds, Move Around Grinder Please

* Oops

* 0 files changed

0 files changed

* undoubles your cyclelink helper

removed
 2023-01-22 15:03:11 +01:00
Ling
deb685ebcd Bluespace locker no longer has infinite power (#17517) 
* Bluespace locker no longer has infinite power

* Make it not autoname
 2023-01-22 13:28:33 +00:00
Ezhan
83bc588b45 fixes gas mixer for air on asteroid and yogs (#17493) 2023-01-20 16:26:48 -06:00
Aquizit
b65e12a112 Box interrogation camera fix (#17569) 
* fixes box double interrogation camera and renames brig infirmary camera name to be more consistent with other camera names

* stupid meta camera naming conventions grumble grumble

* fix meta changed thing
 2023-01-20 13:52:28 +01:00
Byemoh
e79716f088 [Asteroid] Fixes various mapping errors (#17563) 
* dqcwecwec

* engi door access fix

Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
 2023-01-20 12:00:01 +00:00
Jamie D
a6f8a1deab Revert "Revert "BoxStation smaller trims [GONE SEXUAL?] [SEC CALLED]"" (#17540) 
* Revert "Revert "BoxStation smaller trims [GONE SEXUAL?] [SEC CALLED] (#17484)" (#17539)"

This reverts commit 13eb5c5875.

* fucking hate you baiomu

* fuck sake

* e

* e

* ahhhhh

* aaaaa

* fixes some stuff

* Update dynamic.json

* more corners

* morgue

* Fixes

* e

* e

* e

Co-authored-by: Byemoh <baiomurang@gmail.com>
 2023-01-19 12:05:53 +00:00
Aquizit
da09924f36 Adds chem machine to all bar templates, not just Citadel template (#17522) 
* adds chem machine (hoochmaster 9000) to all bar templates not just citadel template

* adding hoochmaster to gax, yogsmeta, and asteroid stations which have no bar template system
 2023-01-17 18:23:26 -06:00
TheRyeGuyWhoWillNowDie
a71ac9772a removes unintended contents from gax and meta armories (#17499) 
* h

* PENIS
 2023-01-17 15:49:26 -06:00
Jamie D
13eb5c5875 Revert "BoxStation smaller trims [GONE SEXUAL?] [SEC CALLED] (#17484)" (#17539) 
This reverts commit ebf3f54b70.
 2023-01-17 17:17:11 +00:00
Byemoh
ebf3f54b70 BoxStation smaller trims [GONE SEXUAL?] [SEC CALLED] (#17484) 
* Add files via upload

* Revert "Add files via upload"

This reverts commit dc4ab8b985.

* whyyy

* aeiou
 2023-01-17 11:58:20 -05:00
Aquizit
c1c4e8f164 moving warden buttons to be on the correct tile for access (#17490) 2023-01-16 15:53:25 +01:00
Jamie D
af2982b562 Oopsie 2023-01-14 00:43:29 +00:00
Byemoh
541394e5dd BoxStation Armory update [BETTER REINFORCED] [GONE SEXUAL?] (#17379) 
* new armory

* Window Shutters!

* Update paper_premade.dm

* e

* fixes

* e

* e

* e2

* oops

* Update motion.dm

* nice

* donut

* Update camera.dm

* e

* fine

* Update shutters_window.dmi

* fixes errors

* Update YogStation.dmm

* syringe bad

* Fixes conflicts

* e

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
 2023-01-13 23:30:19 +00:00
Jamie D
4ab14f42ae When the AI got moved it got nerfed hard in Defences, This ups it a bit (#17355) 
* AI

* AI

* oopsie

* e

* e

* grille

* Fixes

* e
 2023-01-13 22:58:03 +00:00
Ling
df044da860 Backports several SSlighting improvements: overlay lighting (#17271) 
* Backports SSlighting optimizations

* Overlay lighting, first version compiles

* Change conflicting defines

* Sparks and beams dont count towards lumcount

* Fix rendering

* Various fixes

* Fix errors

* Fix PDA light


1

* a

* Update game_options.txt

* Fix plasmaman helmet

* Fixes

* Glowy changes

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
 2023-01-13 22:42:23 +00:00
adamsong
76ecef94ee Fix broken disposals mail sort pipe (#17456) 2023-01-12 22:38:43 -05:00
Aquizit
19c1bb072d putting firedoors on one of the exterior doors that i forgot (#17440) 2023-01-12 22:35:00 +01:00
TheRyeGuyWhoWillNowDie
134e026fca reworks the ebow to be cooler and probably less overpowered (#17150) 
* rework

* Update special.dm

* Update ebow.dm

* g

* Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Update toxin_reagents.dm

* Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
 2023-01-12 11:05:03 +00:00
Jamie D
3c77084bfc Fixes Air Mixers on Maps (#17384) 
* Yogs

* Maps
 2023-01-07 15:13:43 +00:00
Byemoh
0e309e5a82 NT-USP - American Security - How I Learned to Stop Worrying and Love the Gun (#16414) 
* gun

* vendor

* remove disablers from jobs

* poop

* maybe spell it right

* asteroid + gax

* armory

* bye to all your ammo if you get heavy EMP'd

* bald

* sprite adjustment from orca feedback

* ammo change + vending change

* pixel perfect

* Update ArmamentsDispenser.js

* if this works you owe me an antag token

* maps

* Update rechargable.dm

Co-authored-by: ynot01 <ynot000001@gmail.com>
Co-authored-by: Chubbygummibear <kullen.ds@gmail.com>
 2023-01-07 14:06:44 +00:00
Ezhan
4ef4123ed2 asteroid turbine stuff (#17211) 
* asteroid turbine stuff

* Added lattice for Aesthetic

* Update create_object.html

* this was the hardest part of this map change

* Update create_object.html

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
 2023-01-06 13:07:23 +00:00
Byemoh
8b3700fa00 Flips Boxstation Cloning and Genetics (#17262) 
* oh yes

* moves lights

* changes

* going throguh changes
 2023-01-05 20:40:01 -06:00
Jamie D
ee71456440 Moves Syringe Gun to Armoury and Rapid to Armoury Lathe (#17276) 
* Update weapon_designs.dm

* maps
 2023-01-05 14:08:15 -06:00
MenacingManatee
8e06fe114f Adds hallway APCs, fixes piping/wiring (#17302) 2023-01-04 17:08:36 -06:00
00ze-cyclone
c36271e78a bring back the lawyer office on Gax (#17280) 
* lawyer office is back

* evidences in the interrogation room

* bring back lawyer to gax

* oops
 2023-01-04 16:46:00 -06:00
Byemoh
6e5fcb33a1 ae (#17232) 2023-01-02 02:52:20 +00:00
Ling
6b8a6a1c47 Modernize gas filters (multiple filters & consistent movement) (#17230) 
* Modernizes gas filters

* Better names

* Gax fix

* Screen size fix
 2023-01-02 02:50:51 +00:00
Ezhan
bf1d9be5ad Adds ATmospherics Simulator console to every maps turbine area (#17250) 2023-01-01 18:14:54 -06:00
Ling
002e6046d3 Remove pump on Yogsmeta (#17217) 2022-12-31 14:04:59 +00:00
Byemoh
cd2cddf4aa what if though what if (#17212) 2022-12-29 22:53:56 +00:00
RG4ORDR
5143d41379 Changes Asteroid Station Botany,Service hall, and Kitchen. (#16922) 
* Changes Asteroid Station Hydroponics,Service hall, and minor kitchen changes

* Cleaned up any messes I left initially.

* Update2

* APC revision

* RIP wall wrench 2022-2022

* Alarms Fixed

* Final Update

* Haha The Final: Part 1

* The Final: Part 2 - Part 1

* Fleedle Deedle

* The Map For Real this time
 2022-12-27 18:49:45 -06:00
Byemoh
19b49b5672 Removes Lawyer from the NVS Gax, expands brig, various map fixes (#17169) 
* bye

* Update lawyer.dm

* this

* Update lawyer.dm

* lol, lmao even
 2022-12-26 21:27:53 +00:00
Byemoh
9c80960fbb lights (#17138) 2022-12-24 16:16:13 +00:00
Jamie D
410feac06f Disables Rad Goat and Anomaly for Good (#17108) 
* Disables Rad Goat and Anomaly for Good

* Update supermatter.dm

* Map
 2022-12-17 18:31:28 +00:00
Aquizit
7ad9b0e62d New Triage Shuttle (#17034) 
* File creation, basic structure, cryo system, uninjured passenger room.

* Layout testing, temporary

* design flaw fixes

* Final Construction

* Code for shuttle to be pulled and purchased.

* Blood and IV drip, Toolbox for Preternis/IPC mending, Plasmaman Supply Locker (locked to medical general access)

* I promise I can count and totally didn't misalign the bottom airlocks to the station.

* Last touches I forgot after having to change to redo the doors.

* Totally not me changing the smallest little thing (light placement) to get the checks to run again.

* Moved the firedoors by the surgery beds so if there's a breach it won't block access from the correct side as the computers are facing up.

* Defibs mounted ha ha I am such a bad doctor.

* Change the interior brig corner to no-diag to avoid lights floating in mid-air.

* Testing showed cryo system doesn't like the giant O2 tank. A can that needs to be wrenched it is.
 2022-12-17 14:56:54 +00:00