cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,896 Commits 5 Branches 0 Tags
d171ed669ad096980a9840aacea1b3500909bc20
Commit Graph

18462 Commits

Author SHA1 Message Date
Razgriz
6d6bb29eac Remove duplicate vendors 
Because somehow upstream doubled their own code.

🆑
bugfix: remove extra LiquidProtein Ration from SweatMAX vendor.
/🆑
 2021-02-25 03:43:24 -07:00
Novacat
17619cdbda Merge pull request #9750 from VOREStation/upstream-merge-7853 
[MIRROR] QoL Door Closing
 2021-02-19 22:44:36 +00:00
Sharkmare
e87bc13ef0 Adds ability ot changed folded pai access 
Allows PAI access to be changed in folded form.

This is literally just a copy paste job with the variable paths changed.

Origin code can be found in pai.dm
 2021-02-19 13:03:03 +01:00
Razgriz
408f5bc032 Merge pull request #1359 from MisterGrimm/Eggfix 
Fixes xenomorph egg notification for ghost, + fixing stupid stuff I did
 2021-02-18 04:34:24 -07:00
Razgriz
e26a3349d0 Merge pull request #1358 from CHOMPStationBot/upstream-merge-9739 
[MIRROR] Adds in two new manuals for Bar keep and Kitchen.
 2021-02-18 04:32:58 -07:00
Razgriz
a1b49e2fc5 Merge pull request #1357 from CHOMPStationBot/upstream-merge-9738 
[MIRROR] Two fixes for messages I noticed in logs
 2021-02-18 04:32:14 -07:00
Razgriz
930dbf3317 Merge pull request #1346 from Sharkmare/patch-5 
Adding the clown and mime but with a twist
 2021-02-18 04:30:45 -07:00
Razgriz
d3fda2be7a Merge pull request #1344 from Sharkmare/i-baked-you-a-PAI 
PAI changes, no suicide, move wipe
 2021-02-18 04:30:08 -07:00
Razgriz
4729aba17f Merge pull request #1340 from CHOMPStationBot/upstream-merge-9727 
[MIRROR] [MIRROR] Makes wrenches only anchor lockers if they're open
 2021-02-18 04:28:54 -07:00
Razgriz
29ca7cf466 Merge pull request #1339 from CHOMPStationBot/upstream-merge-9726 
[MIRROR] Fixes malf airtank runtime spam
 2021-02-18 04:28:22 -07:00
Razgriz
0eb0fffc28 Merge pull request #1338 from LunarFleet/book 
Kassc's bedtime story
 2021-02-18 04:27:34 -07:00
Razgriz
c4af6698f2 Merge pull request #1296 from CHOMPStationBot/upstream-merge-9017 
[MIRROR] Add Rapid Pipe Dispenser to R&D
 2021-02-18 04:17:24 -07:00
Sym
f718e0915e Fix xenomorph egg notification & remove glob var I added 
Removes a global var that wasn't used that I added in a fit to stupidity, and fixes the snowflake ghost_pod code for xenomorph eggs.
 2021-02-18 06:04:09 -05:00
Chompstation Bot
55abff0e3a Adds in two new manuals for Bar keep and Kitchen. 2021-02-17 19:54:04 +00:00
Novacat
9e5a5c4c46 Merge pull request #9738 from VOREStation/twologfix 
Two fixes for messages I noticed in logs
 2021-02-17 15:40:52 +00:00
Razgriz
d3669194b2 Merge pull request #1351 from CHOMPStationBot/upstream-merge-9735 
[MIRROR] Additional GC Fixes
 2021-02-16 21:57:22 -07:00
Razgriz
728990b8d2 Merge pull request #1349 from CHOMPStationBot/upstream-merge-9734 
[MIRROR] Fixes init issues in _vr files.
 2021-02-16 21:50:46 -07:00
Verkister
90ef89bb75 Merge pull request #9736 from VOREStation/Verkister-patch-8 
Fixes explorer shield light runtime spam
 2021-02-16 20:01:19 +00:00
Novacat
8111e7bd10 Merge pull request #9735 from Novacat/nova-basicfixes 
Additional GC Fixes
 2021-02-16 19:48:00 +00:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes 
Fixes init issues in _vr files.
 2021-02-16 17:59:00 +00:00
Sharkmare
a347c1f2a2 Adding the clown and mime but with a twist 
So the clown and mime are commonly given their own slots on the job page,

I thought that`s kinda silly, both have as goal to ENTERTAIN the crew, so why not just make them ALT titles of the Entertainer.

They retain their unique outfits however.
 2021-02-16 15:24:57 +01:00
Sharkmare
54407252d0 PAI changes, no suicide, move wipe 
Removes PAI suicide
Moves WIPE and makes it a bit more clear
Amd adds tje ability to unbind master, for those awkward times when your master doesnt want you anymore or you two just arent compatible,
 2021-02-16 11:02:55 +01:00
Novacat
ad8b82ce05 Merge pull request #9727 from VOREStation/upstream-merge-7844 
[MIRROR] Makes wrenches only anchor lockers if they're open
 2021-02-16 01:33:19 +00:00
Novacat
2e92857ff5 Merge pull request #9726 from VOREStation/Verkister-patch-8 
Fixes malf airtank runtime spam
 2021-02-15 23:38:19 +00:00
LunarFleet
24453ebf05 Kassc's bedtime story 2021-02-15 17:58:01 -05:00
Chompstation Bot
653d2b9179 Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled) 2021-02-14 08:51:59 -05:00
Chompstation Bot
6ec5b84175 TGUI Character Directory (baked bundle) 2021-02-14 07:55:01 -05:00
Nadyr
39292dfe36 Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676 
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
 2021-02-14 07:33:01 -05:00
Nadyr
83861014e7 Merge pull request #1308 from CHOMPStationBot/upstream-merge-9691 
[MIRROR] [MIRROR] Allows custom-selection of posters
 2021-02-14 07:09:52 -05:00
Nadyr
2f25c9d41a Merge pull request #1312 from CHOMPStationBot/upstream-merge-9696 
[MIRROR] [MIRROR] New Shutters and Sprite replacements
 2021-02-14 07:03:34 -05:00
Razgriz
6c24dfe4c2 Merge pull request #1285 from CHOMPStationBot/upstream-merge-9682 
[MIRROR] Properly centers projectile/beam icons
 2021-02-13 16:02:00 -07:00
Razgriz
c8dd2d51f3 Merge pull request #1282 from CHOMPStationBot/upstream-merge-9612 
[MIRROR] [MIRROR] Fixed global_announce autospeaker
 2021-02-13 15:56:00 -07:00
Razgriz
ebe5c88699 Merge pull request #1273 from CHOMPStationBot/upstream-merge-9543 
[MIRROR] [MIRROR] Space cleaner cleans mobs
 2021-02-13 15:52:23 -07:00
Razgriz
fb1b9447a9 Merge pull request #1321 from CHOMPStation2/revert-1242-Razgriz1032-patch-15 
Revert "FIX WHITELIST AGAIN"
 2021-02-13 15:47:15 -07:00
Razgriz
11b77c32bc Merge pull request #1257 from CHOMPStationBot/upstream-merge-9651 
[MIRROR] [MIRROR] Absurd Amount of Food Fixes
 2021-02-13 15:18:39 -07:00
Razgriz
9ee3e4d897 Merge pull request #1252 from CHOMPStationBot/upstream-merge-9645 
[MIRROR] The clime offices
 2021-02-13 15:14:02 -07:00
Razgriz
b7c1a33159 Revert "FIX WHITELIST AGAIN" 2021-02-13 14:35:56 -07:00
Razgriz
ff3a710fc8 Update special_vr.dm 2021-02-12 20:24:17 -07:00
Novacat
b395afa19c Merge pull request #9696 from VOREStation/upstream-merge-7866 
[MIRROR] New Shutters and Sprite replacements
 2021-02-13 00:48:18 +00:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Razgriz
794fa81e5b Update vending_machines_vr.dm 2021-02-12 00:35:00 -07:00
Razgriz
9991b470c3 Update vending_machines_vr.dm 
Fuck these snowsuits, changed the trek suits to what we have.
 2021-02-11 23:07:54 -07:00
Razgriz
34a16a7078 Merge branch 'master' into upstream-merge-9435 2021-02-11 22:53:36 -07:00
Razgriz
d600952be7 Merge pull request #1167 from CHOMPStationBot/upstream-merge-9517 
[MIRROR] [MIRROR] Directional Signs Update
 2021-02-11 22:23:56 -07:00
Chompstation Bot
6f2b456c79 Add Rapid Pipe Dispenser to R&D 2021-02-11 13:28:31 +00:00
Verkister
113bf6356a Merge pull request #9676 from H0lySquirr3l/master 
Adds in 1 new eggs end 3 joke eggs.
 2021-02-11 10:59:20 +00:00
Chompstation Bot
f2fc3dab17 Properly centers projectile/beam icons 2021-02-10 22:12:32 +00:00
Verkister
ac8a77dd06 Merge pull request #9612 from VOREStation/upstream-merge-7839 
[MIRROR] Fixed global_announce autospeaker
 2021-02-10 10:11:30 +00:00
Verkister
3e2d6f6f76 Merge pull request #9543 from VOREStation/upstream-merge-7802 
[MIRROR] Space cleaner cleans mobs
 2021-02-09 18:18:03 +00:00
Razgriz
303d89b3f8 Fix runtime 
DEBUG: Runtime in areas.dm,402: Cannot read null.len
 2021-02-07 22:03:16 -07:00