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
94,390 Commits 21 Branches 0 Tags
e207af92a1a5916be28eeab68b9e06d4f84b3f72
Commit Graph

610 Commits

Author SHA1 Message Date
N3D6
e7dc639f4c CentCom debrief area tweaks + Test chamber bugfixes (#12208) 
* stuff

* CCstuff

* cc-changes

* fixes some shit

* fix a description i goofed
 2021-09-07 08:39:04 +02:00
alexkar598
095bd82b9f Splits space adapt into two mutations, space adaptation and heat adaptation (#12052) 
* Splits space adapt into two mutations, space adaptation and heat adaptation

* Bugfix and conflict var

* Better icon

* Wrong way around
 2021-08-26 22:02:12 +02:00
wejengin2
32ee2bcfbd All the mapping fixes (#11406) 
* mhm

* armory

* pod shit

* another one

* one more

* fix
 2021-04-25 11:06:12 +00:00
alao3alao3
414f79a63b Thickens the Tear in the Fabric of Reality border by 3 (#11173) 
* I love oneliners

* you're fucking next bs locker

* hope nobody figures out the useless exploit I couldnt patch
 2021-03-20 10:01:28 +01:00
Theos
bf08d5e9ff emergency layer of anticringe (#11172) 2021-03-20 09:54:18 +01:00
wejengin2
7acc397ec2 fixes (#10917) 2021-01-23 12:12:27 +00:00
Redmoogle
7bcd39fc6b [Semi-Port] Auxbase TGUI + LPM Intergration (#10838) 
* auxbase upgrade

* fixes
 2021-01-16 12:50:23 +00:00
ynot01
9885b02ab6 singularity sword (#10815) 
* singularity sword

* puts it in cc

* exchanges sprite
 2021-01-16 12:42:49 +00:00
alao3alao3
8a14c9942a Fixes missing areas at CentCom (#10638) 
* Fixes missing areas at CentCom

* copy & paste
 2020-12-12 15:00:44 +00:00
alao3alao3
8b269c7404 (Again) Adds new Holodeck Enviorment: Gym (#10640) 
* /ɡaɪm/? What's a /ɡaɪm/?

* if theres any other files to change just say

* work damn you

* did you fuckers lube the railings or something
 2020-12-11 10:32:52 +01:00
wejengin2
7d9ff948d2 [boring] Fixes apc map errors (#10600) 
* pixels

* validated
 2020-12-11 09:17:25 +00:00
wejengin2
e301a0b364 [boring] Fixes some mapping issues (#10564) 
* commit message

* taehuswgrh
 2020-12-04 20:38:17 +00:00
Jamie D
5224986766 Better Chess - Part 1 (#10383) 
* Part 1

* letters

* Closets

* lockers

* Update floors.dmi

Co-authored-by: wejengin2 <patpol4@protonmail.com>
 2020-11-12 23:28:17 +00:00
Jamie D
bc327f8974 Much bigger holodeck, enables actual chess games now. (#10353) 
* 9x10

* E

* oops

* ugly carpet

* box review and perma

* icebox

* icebox areas smh

* eclipse perma and review

* delta and meta review

* Corruption bad

* Hmm

* Fixes Shitbox

Co-authored-by: wejengin2 <>
 2020-11-08 16:56:11 +00:00
Hopekz
e3cd4403ec Adds cheese staff to CentCom loot room (#10345) 2020-11-06 20:25:23 +01:00
Taylor
f529a7df4c Removed bombs from Centcom test area due to the fuckload of logs it creates every round end. (#10330) 2020-11-05 20:55:57 +01:00
MonsWTF
5fc843ba7e The Toxins Update - New machine & miner map tweaks (#9608) 
* LAM completed - GPS' updated

* L.A.M. Installed

* woops, tracking offline GPS coords

Also fixing Lavaland roundstart GPS displays from showing active despite being turned off for safety purposes.

* Code cleanup before PR

* Removing unnecessary var

var/loaded and var/scibomb really were being used for parallel cases. Yeet.

* Last pass before PR

One more ingame test to make sure I didn't break anything.

* Just kidding, one more.

Found another missed check.

* Those should be 0 too.

* autodoc?

* Re-adding LAM to Meta

* Pair in theses

* Literally no point in keeping this since you can visually see if there's a bomb

* Even more autodoc?

* Oops spacing

* Z-level tracked in Init, Countdown timer switched to max()

* Re-building tgui to include LAM

And apparently my master was missing reflector + feral_cat adjustments...?

* Rebuild tgui

* fixing conflicts

* box

* meta

* delta

Co-authored-by: Jean <wuatduhf@gmail.com>
Co-authored-by: wejengin2 <patpol4@protonmail.com>
 2020-10-25 17:53:57 +00:00
Wayward Horizons
8348795a64 Replaces botany paper/book with wiki-based, useful manuals (#10132) 
* Does stuff

* unfuck UO45
 2020-10-24 23:27:36 -04:00
Darkstick
f0e196d7d2 Replaces the atmospheric burn test holodeck program by lava incinerator program. (Take two!) (#9972) 
* text change

* map change

* smooth lava

Co-authored-by: wejengin2 <patpol4@protonmail.com>
 2020-10-19 15:53:40 +02:00
Redmoogle
b4ddb72c3f [PORT] Baystation Instruments! (but only kinda baystation because I rewrote it nearly from the ground up) (#9894) 
* uhhhh

* Fixes missing piano

* Fixes

* fixes the boogaloo

* Spacepods dont exist, shoo

* Fixes legacy instruments

* Revert "Fixes legacy instruments"

This reverts commit 753b0874d6.

* fix accordions

* Removes tone for sanity

* Eat Shit piano conflicts

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-10-17 13:32:05 +01:00
Theos
4e7227c062 substantially decreases the amount of plasma present on the burn test holodeck program (#9922) 2020-10-11 22:23:37 +01:00
ynot01
1192c416a1 Removes Banhammer from Maps and Spawns(#9819) 
* removes banhammer

* centcoom

* Update code/game/objects/items/weaponry.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
 2020-09-28 20:08:41 +01:00
boodaliboo
d3297e8cdb gives wizard a box with internals (#9730) 
* gives wizard a box with internals

* Update standard.dm
 2020-09-24 19:54:20 +01:00
boodaliboo
be7d7f8e90 f (#9636) 2020-09-11 10:28:28 +02:00
Wayward Horizons
a8172dd6ff CentCom recovery ship mini-updates (mounted defib, bathroom, Captain Cleanbot, and a dead mouse) (#9436) 
* Adds a mounted defibrillator to the CentCom recovery ship, as well as a bathroom, additional seating, and a dead mouse. Ew.

* Additional pre-PR tweaks

* Removed the age restriction and expands inventory of Donksoft vendors

* bathroom firelocks

Co-authored-by: wejengin2 <patpol4@protonmail.com>
 2020-08-13 14:28:17 +02:00
Wayward Horizons
05934da5d6 Revamps the CentCom recovery ship (#9326) 
* Revamps the CentCom recovery shuttle

* Ktlwjec1/Wejengin2 suggested changes
 2020-07-28 20:37:51 +02:00
swissloaf
48bf1432fc [admin] Adds ERT Mech Bay (#9250) 
* Update poddoor.dm

* nopice

* NOICER

* noicest

* noice

* try again

* spicy

* Update ert.dm

* Update poddoor.dm

* Update poddoor.dm

* Turdis sucks and is broken again

* Turdis re-reun

* Update security_levels.dm

* Noice prettyifier
 2020-07-20 18:37:43 -04:00
Jamie D
d3fada1b9a Enables Wide-ishscreen (#8847) 
* Enables Widescreen

* icon for lobby

* Title screen bad extension
 2020-07-04 13:05:08 -04:00
wejengin2
126815d143 [boring] Limits the amount of of active turfs at roundstart (#9093) 
* turfs

* airtank

* tyop

* smh

* trackers

* fuck off conflicts, ill get yogbox speedmerged separately
 2020-07-03 10:48:29 +01:00
Jamie D
76f902d570 Removes Reebe Meta (#8849) 2020-06-29 21:05:00 +01:00
Theos
b703b36ba0 using a fork on the ark creates spaghetti (#9013) 
* ark produces spaghetti on being hit with a fork

* spaghetti and cooldowns

* Update ark_of_the_clockwork_justicar.dm

* whoops

* city of cogs has forks to attain spaghetti with
 2020-06-26 22:33:22 +01:00
wejengin2
45064cd360 Adds tiny fans under the escape blast doors in Central Command (#8731) 
* onion?

* git

* fans
 2020-06-02 00:51:46 +01:00
Thomas
222a297e53 Fixes for the Experimental Tools (#8421) 
* better tools revamped

* map fixes

* updates hopek's ert to use the new tools

* Update multiz.dmm

aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* appeases hopek

Co-authored-by: Hopekz <hopekxx@gmail.com>
 2020-05-08 11:54:13 -05:00
Hopekz
8b2e7406e5 Increases number of Response team spawners from 9 to 18 (#8327) 2020-04-30 16:20:17 -05:00
Readystorm546
24157822d3 Theos Yells at me 
_ Fixed the floor tile sof the clock map to be the proper tiles that will teliport you back if you cross over the line.
 2020-03-30 19:23:10 -04:00
Readystorm546
85fd786102 I change clock cult map forever 
Hah hah got em
 2020-02-15 18:11:01 -05:00
monster860
97996ce239 FastDMM2 integration (#7776) 
* fastdmm integration

* map validation

* undoes minsky stuff for now
 2020-02-13 12:06:43 -05:00
Hopek
856a200e1c Merge remote-tracking branch 'upstream/master' into Boxes_fold_out 2020-01-27 11:39:13 -06:00
Hopek
e2eda8d90a Makes most special containers foldable by making them a child of box 2020-01-27 04:30:50 -06:00
Takahiru
9bdfbe0de4 Update CentCom.dmm 2020-01-15 11:54:18 -05:00
Takahiru
fb20f3b6e5 Fixes that error singularity lol 2020-01-15 09:25:07 -05:00
Takahiru
c5a2086190 Repaths the wizard Hardsuit, battlemage spell gives armor and helmet. 2020-01-14 16:05:00 -05:00
Theos
b1241fd0d6 Ports guardian rework from hippie (#7201) 
* HAND OVER THE STAND ARROW BUCCARATO

* a

* bruh

* missed

* whoops

* fuckit, stand meteors

* stupid academy

* stupid OTHER ACADEMY

* should probably work

* holyparasite stuff

* fukc

* Update holy_weapons.dm

* Update holy_weapons.dm

* Update holy_weapons.dm

* Update runes.dm

* Update runes.dm

* bruh

* finally actually fixes holyparasite and probably berzerk frenzy I guess

* buccarato

* stand meteor can spawn on meteor events sometimes

* random guardians

* runtime fix and actual pocket dimension work

* aaaaaaaaaaaaaaaaa

* fix some stuff

* Update time.dm

* Update time.dm

* Update time.dm

* Super vital fix

* guardian syndiekit

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* Theos dies in the end

* bruh

* bruh

* aaaaaaaaaaaaaaaaaaaaaaaaa

* bruh

* Update CentCom.dmm

* Update holy_weapons.dm

* moves limited healing

* Update holy_weapons.dm

* update travids

* stands now lose their users on death

* Aaaaa

* ????????????

* ok

* May have been a bad idea not sure

* this would probably be a good idea

* fix stuff
 2019-12-28 19:48:42 +01:00
Nichlas Pihl
1447236592 Merge pull request #7334 from Mr-Space/debris-follow-fix 
Debris follow fix 2: Electric Boogaloo
 2019-12-24 11:21:31 +01:00
Mr-Space
c307947f26 just testin somethin 2019-12-23 12:38:06 +03:00
Mr-Space
8274a66392 Revert "notdebris edit" 2019-12-23 12:32:00 +03:00
Mr-Space
8571b4bbff notdebris edit 2019-12-23 12:12:15 +03:00
Szyszkrzyneczka
83b3c53602 Fixes issue #7107 
makes holding facility more fun
 2019-12-14 23:30:57 +01:00
Nichlas Pihl
a3f0473a4e Merge pull request #7270 from Szyszkrzyneczka/centcomfixingyes 
Now you can use runes on CentCom
 2019-12-10 09:27:50 +00:00
Readystorm546
260bc40c96 Theos be like 
Okay boomer
 2019-12-09 23:17:35 -05:00