Commit Graph

19240 Commits

Author SHA1 Message Date
Chompstation Bot
21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Aronai Sieyes
56b13551f7 Merge pull request #11306 from Verkister/patch-76
Changes laptop glow from green to blue to match new sprites
2021-08-01 03:25:52 +00:00
Nadyr
0e37c56fdc Merge pull request #2686 from CHOMPStationBot/upstream-merge-11298
[MIRROR] Add arcadey carpets
2021-07-29 19:11:13 -04:00
Nadyr
9152417438 powder that makes you say yes 2021-07-29 18:58:35 -04:00
Chompstation Bot
ae737fe4a1 Add arcadey carpets 2021-07-29 20:10:19 +00:00
Aronai Sieyes
7aec486d70 Merge pull request #11296 from VOREStation/Arokha/randomfixes
Two random map fixes
2021-07-29 20:09:10 +00:00
Aronai Sieyes
1a4d49d422 Merge pull request #11293 from VOREStation/upstream-merge-8174
[MIRROR] Custom poster fix
2021-07-29 03:07:40 +00:00
Nadyr
514afc6d17 Merge pull request #2683 from CHOMPStationBot/upstream-merge-11290
[MIRROR] Remove atom/Uncross override
2021-07-28 20:03:27 -04:00
Nadyr
3f19639e03 powder that makes you say yes 2021-07-28 18:58:49 -04:00
Nadyr
08de1e1dbf powder that makes you say yes 2021-07-28 18:39:46 -04:00
Chompstation Bot
d4c6afa5af Remove atom/Uncross override 2021-07-28 20:43:23 +00:00
Chompstation Bot
bd6b38ca42 Improve whitelist checking speed 2021-07-28 20:43:16 +00:00
Nadyr
4a1993aec4 Merge pull request #2679 from CHOMPStationBot/upstream-merge-11218
[MIRROR] 7/23/2021 Drink Revamp
2021-07-27 19:37:49 -04:00
Nadyr
7c819d0649 powder that makes you say yes 2021-07-27 19:17:25 -04:00
Nadyr
e23dbf5a3d Merge pull request #2678 from Shadowfire117/casinomanualrework
Final out of home casino changes
2021-07-27 19:05:03 -04:00
Chompstation Bot
02af50470c 7/23/2021 Drink Revamp 2021-07-27 22:06:30 +00:00
Shadowfire117
813bbbaba2 Final out of home casino changes
Realised the roulette code could be better and simplified it
Added more entries and modernized the new casino manual. Still WIP sections that are disabled for now. Will have to wait for next event!
2021-07-27 23:48:08 +02:00
Aronai Sieyes
5c671c929a Merge pull request #11272 from VOREStation/Arokha/airalarm
Try to optimize air alarm processing
2021-07-27 15:42:09 +00:00
Novacat
13fb556789 Merge pull request #11262 from VOREStation/Arokha/what
What???
2021-07-27 01:11:50 +00:00
Nadyr
9cf1fa2a1f Merge pull request #2669 from CHOMPStationBot/upstream-merge-11259
[MIRROR] AAAAAA
2021-07-26 18:32:22 -04:00
Nadyr
14988545b5 Merge pull request #2667 from CHOMPStationBot/upstream-merge-11210
[MIRROR] 7/22/2021 Food Revamp
2021-07-26 18:31:47 -04:00
Nadyr
263538e2e0 Merge pull request #2654 from Shadowfire117/casinomanualrework
Less Ringa ding and work in progress new casino manual
2021-07-26 18:24:24 -04:00
Aronai Sieyes
5d6d45904d Merge pull request #11259 from VOREStation/Arokha/dropfix
AAAAAA
2021-07-26 21:24:07 +00:00
Ghost Actual
50c2de86d2 7/22/2021 Food Revamp (#11210)
* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Conflict Fix

* Oopsie

* Fixes known issues

* Uploads Files for Remote Work

* Small Fix

* Final Commit (hopefully)

* Small Fix
2021-07-26 16:51:23 +00:00
Chompstation Bot
6df9089784 Adds medical kiosk to code/buildable 2021-07-25 22:02:18 +00:00
Chompstation Bot
f97dfc5dea More TGMC Ports 2021-07-25 21:45:48 +00:00
Shadowfire
94b8471cc0 Less Ringa ding and work in progress new casino manual
Now people cant spam the slot machines and get platinum coins, they are once more special! Also new codex casino manual. Albeit still entries needs to be done at later moments but is being added for safety reasons and to access while I only have a laptop to work on.
2021-07-25 17:45:47 +02:00
Nadyr
03e7614962 Merge pull request #2650 from CHOMPStationBot/upstream-merge-11229
[MIRROR] [MIRROR] Sign Oh Sure
2021-07-25 02:42:24 -04:00
Nadyr
189669c6ef Merge pull request #2649 from CHOMPStationBot/upstream-merge-11230
[MIRROR] Add tgmc doors as an option for angled airlocks
2021-07-25 00:57:26 -04:00
Nadyr
74079df6e3 powder that makes you say yes 2021-07-25 00:45:22 -04:00
Nadyr
f561b836d2 powder that makes you say yes 2021-07-25 00:41:10 -04:00
Nadyr
871550539f Merge pull request #2648 from CHOMPStationBot/upstream-merge-11227
[MIRROR] Improve admin spawn features
2021-07-24 23:52:07 -04:00
Nadyr
ebf31e8d50 Merge pull request #2647 from CHOMPStationBot/upstream-merge-11224
[MIRROR] Add recycling machinery
2021-07-24 23:44:49 -04:00
Nadyr
19944c3ba0 Merge pull request #2645 from CHOMPStationBot/upstream-merge-11220
[MIRROR] New Rack and Wardrobe
2021-07-24 23:44:37 -04:00
Nadyr
ea3e19ffb3 Merge pull request #2643 from Shadowfire117/sentientprizework
Casino Sentient Prize Rework
2021-07-24 17:34:22 -04:00
Chompstation Bot
3e3d82a363 [MIRROR] Sign Oh Sure 2021-07-24 18:12:50 +00:00
Chompstation Bot
fd4c50fbec Add tgmc doors as an option for angled airlocks 2021-07-24 18:12:44 +00:00
Chompstation Bot
8b01c674d0 Improve admin spawn features 2021-07-24 17:05:36 +00:00
Chompstation Bot
8818729b17 Add recycling machinery 2021-07-24 17:04:28 +00:00
Chompstation Bot
6280067d11 New Rack and Wardrobe 2021-07-24 16:42:54 +00:00
Shadowfire
f4c8f0078e Sentient Prize rework
Made an automated hub system called SPASM
People can volunteer and get chips and a personalized collar that shows their avaliability. Crew can at the hub see who has a collar and if they are available or if owned, by who. Crew can buy a sentient prize and the collar will remotely be updated to reflect owned status. Likewise the personalized prize can buy themself out of the system if they got the chips and aren't owned, else the owner can swipe their collar on the hub and release them. Casino management has full access and can delete entries as well and enable/disable the sales hub. 

And remember! Its not slavery which is illegal by the admirality law! Its just friendly and fun temporary indentured servitude!~
2021-07-24 13:12:18 +02:00
Nadyr
025732b41e Merge pull request #2642 from CHOMPStationBot/upstream-merge-11222
[MIRROR] Angled wall bits 'n bobs
2021-07-24 00:54:48 -04:00
Nadyr
0872aa5719 powder that makes you say yes 2021-07-24 00:29:55 -04:00
Chompstation Bot
7714b9c393 Angled wall bits 'n bobs 2021-07-23 22:51:32 +00:00
Chompstation Bot
73086eb5cf Small changes to AI Core 2021-07-23 20:27:15 +00:00
Nadyr
9c2a7939df powder that makes you say yes 2021-07-22 19:22:56 -04:00
Nadyr
cae6dc6f04 Merge branch 'master' into upstream-merge-11213 2021-07-22 19:18:04 -04:00
Nadyr
bfed1b4cd4 Merge pull request #2636 from CHOMPStationBot/upstream-merge-11204
[MIRROR] Port Bay and Eris walls
2021-07-22 19:14:46 -04:00
Nadyr
1433deddfc Merge pull request #2626 from CHOMPStationBot/upstream-merge-11197
[MIRROR] Expands spider features
2021-07-22 18:26:01 -04:00
Chompstation Bot
c296437dc1 Angled wall tweaks 2021-07-22 21:58:13 +00:00