Nadyr
9cf1fa2a1f
Merge pull request #2669 from CHOMPStationBot/upstream-merge-11259
...
[MIRROR] AAAAAA
2021-07-26 18:32:22 -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
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
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
Chompstation Bot
3e3d82a363
[MIRROR] Sign Oh Sure
2021-07-24 18:12:50 +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
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
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
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
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
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
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
12997ce830
powder that makes you say yes
2021-07-20 18:53:55 -04:00
Aronai Sieyes
26f3292fc1
Merge pull request #11178 from Mewchild/MC-TtSQoL
...
TTS Devices can now be used in chairs, and by alt clicking from pockets
2021-07-20 21:30:27 +00:00
Chompstation Bot
15cafbe65b
Optimize a couple things
2021-07-20 21:30:20 +00:00
Aronai Sieyes
442c888d5e
Merge pull request #11181 from VOREStation/Arokha/farpaint
...
Add art possibility to Virgo 2 surface outpost
2021-07-20 21:30:04 +00:00
Aronai Sieyes
369afc6018
Merge pull request #11182 from VOREStation/Arokha/bucklefind
...
Add code to trace recursive buckle issue
2021-07-20 21:29:56 +00:00
Chompstation Bot
7437154387
Allows hiding mobs/areas from observers without completely forbidding
2021-07-20 15:03:10 +00:00
Aronai Sieyes
66669af98d
Merge pull request #11170 from Heroman3003/thepurge
...
Finishes purge of Industrial Expansion
2021-07-20 14:46:30 +00:00
Chompstation Bot
ba4dc7c3ff
Tweak alien eggs
2021-07-20 03:19:59 +00:00
Chompstation Bot
b85c5de137
Xenomorph Overhaul and fixes from Gurgstation
2021-07-20 01:06:44 +00:00
Nadyr
d189d28954
Merge pull request #2596 from CHOMPStationBot/upstream-merge-11153
...
[MIRROR] Fixes #11151
2021-07-19 19:56:57 -04:00
Aronai Sieyes
bd74045604
Merge pull request #11153 from VOREStation/Fixes/11151attempt2
...
Fixes #11151
2021-07-19 22:22:45 +00:00
Chompstation Bot
dc1328d93c
Fixes Talon being referred to as if ITV is a company
2021-07-19 15:12:30 +00:00
Novacat
b456b5287b
Merge pull request #11121 from KillianKirilenko/kk-fixes2
...
Fix Agent IDs
2021-07-17 14:24:27 +00:00
Nadyr
5c7226fa54
Merge branch 'master' into upstream-merge-11110
2021-07-16 19:09:43 -04:00
Nadyr
f201b53fe4
powder that makes you say yes
2021-07-16 18:15:52 -04:00
Nadyr
257787e880
powder that makes you say yes
2021-07-16 18:13:42 -04:00
Chompstation Bot
d0d23ed393
Fixes a bunch of bools missed in #11100
2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Nadyr
20e6781341
Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080
...
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
2021-07-15 20:26:17 -04:00
Nadyr
46034c244b
powder that makes you say yes
2021-07-15 19:36:22 -04:00
