Nadyr
c8ff410f64
Merge pull request #2790 from CHOMPStationBot/upstream-merge-11396
...
[MIRROR] Fix Salamanders and Wall-lockers
2021-08-13 23:46:21 -04:00
Chompstation Bot
f5212e0053
Fix Salamanders and Wall-lockers
2021-08-13 15:40:58 +00:00
Chompstation Bot
beef8e7f82
Virology Revamp
2021-08-13 15:38:46 +00:00
Nadyr
6b5aad478a
Merge pull request #2776 from CHOMPStationBot/upstream-merge-11387
...
[MIRROR] Fixes infinite material duplication in R&D
2021-08-11 20:47:50 -04:00
Novacat
b291d87e18
Merge pull request #11387 from Heroman3003/dupefix
...
Fixes infinite material duplication in R&D
2021-08-11 02:51:43 +00:00
Aronai Sieyes
4a39834222
Merge pull request #11385 from Very-Soft/maintpredintro
...
Adds extra text to maint pred and morph spawns
2021-08-10 23:12:09 +00:00
Aronai Sieyes
7463a1bd6e
Merge pull request #11368 from VOREStation/Arokha/closetanim
...
Port of monster860's animated doors to Bay closets
2021-08-09 03:28:57 +00:00
Aronai Sieyes
a66ac79179
Merge pull request #11336 from VOREStation/Icons/skyratexting
...
Skyrat extinguisher cabinet sprites
2021-08-06 15:36:06 +00:00
Aronai Sieyes
b93b572626
Merge pull request #11331 from VOREStation/Icons/skyratbenches
...
Skyrat benches
2021-08-04 02:50:20 +00:00
Nadyr
c1256426da
Merge branch 'master' into upstream-merge-11324
2021-08-01 17:49:14 -04:00
Nadyr
f0d5ea81a4
Merge pull request #2710 from CHOMPStationBot/upstream-merge-10773
...
[MIRROR] [MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 17:47:09 -04:00
Nadyr
aa3c056af6
powder that makes you say yes
2021-08-01 15:11:58 -04:00
Chompstation Bot
0857ab35f3
Few more outdoors fixes
2021-08-01 16:26:38 +00:00
Chompstation Bot
21b6022a3a
[MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 15:41:46 +00:00
Chompstation Bot
4090222cda
Janitor Equipment Fix
2021-08-01 14:45:35 +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
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
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
