Commit Graph

19219 Commits

Author SHA1 Message Date
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
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
Chompstation Bot
1372d838e1 Port Bay and Eris walls 2021-07-22 20:29:32 +00:00
Aronai Sieyes
23e62b1217 Merge pull request #11205 from VOREStation/Arokha/hullcornerao
Dodge ambient occlusion on hull corners
2021-07-22 16:29:51 +00:00
Chompstation Bot
58a498c918 Expands spider features 2021-07-22 16:20:15 +00:00
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179
[MIRROR] Optimize a couple things
2021-07-20 21:45:26 -04:00
Nadyr
c399d6a682 powder that makes you say yes 2021-07-20 21:28:09 -04:00
Nadyr
dba3747ed5 Merge pull request #2621 from CHOMPStationBot/upstream-merge-11165
[MIRROR] Small light optimizations
2021-07-20 21:26:15 -04:00
Nadyr
ce4763c2fb Merge pull request #2618 from CHOMPStationBot/upstream-merge-11178
[MIRROR] TTS Devices can now be used in chairs, and by alt clicking from pockets
2021-07-20 21:24:59 -04:00
Nadyr
1902d10543 powder that makes you say yes 2021-07-20 21:16:01 -04:00
Nadyr
fa6ec29be6 powder that makes you say yes 2021-07-20 21:14:45 -04:00
Nadyr
a5485ef8f1 powder that makes you say yes 2021-07-20 21:14:18 -04:00
Nadyr
170ad8680e powder that makes you say yes 2021-07-20 21:09:46 -04:00
Nadyr
f2633453de powder that makes you say yes 2021-07-20 21:08:30 -04:00
Nadyr
4cb45618a0 powder that makes you say yes 2021-07-20 21:06:36 -04:00
Nadyr
d6f1561d42 Merge branch 'CHOMPStation2:master' into upstream-merge-11163 2021-07-20 21:05:41 -04:00
Nadyr
b48ecdbc98 Merge pull request #2601 from CHOMPStationBot/upstream-merge-11112
[MIRROR] Xenomorph Overhaul and fixes from Gurgstation
2021-07-20 21:04:13 -04:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
Nadyr
6d04a2b025 Merge pull request #2610 from CHOMPStationBot/upstream-merge-11176
[MIRROR] Allows hiding mobs/areas from observers without completely forbidding
2021-07-20 20:54:22 -04:00
Nadyr
62cc1bc89d Merge pull request #2615 from CHOMPStationBot/upstream-merge-11181
[MIRROR] Add art possibility to Virgo 2 surface outpost
2021-07-20 20:41:59 -04:00
Nadyr
08496b6695 Merge pull request #2614 from CHOMPStationBot/upstream-merge-11182
[MIRROR] Add code to trace recursive buckle issue
2021-07-20 20:40:42 -04:00
Nadyr
eca41e58cd Merge pull request #2607 from CHOMPStationBot/upstream-merge-11170
[MIRROR] Finishes purge of Industrial Expansion
2021-07-20 20:28:28 -04:00
Nadyr
5f5ab7b22c Merge pull request #2604 from CHOMPStationBot/upstream-merge-11162
[MIRROR] Fix two suit cycler problems
2021-07-20 20:27:09 -04:00