Commit Graph

3692 Commits

Author SHA1 Message Date
Razgriz
1b9d60be6c Update storage.dm 2021-07-03 00:27:01 -07:00
Nadyr
18395abbe7 Merge pull request #2314 from CHOMPStationBot/upstream-merge-10769
[MIRROR] Allows removing items from storage easier
2021-07-01 21:31:51 -04:00
Nadyr
8171e7736b Merge pull request #2303 from CHOMPStationBot/upstream-merge-10775
[MIRROR] [MIRROR] Halves Item Slowdown Effects
2021-07-01 21:30:30 -04:00
Aronai Sieyes
04c88a9ec1 Merge pull request #10769 from VOREStation/Arokha/storageclick
Allows removing items from storage easier
2021-06-30 19:37:06 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
c97b47de72 [MIRROR] Halves Item Slowdown Effects 2021-06-28 11:32:00 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727
[MIRROR] Medicine Tweaks
2021-06-26 13:24:46 -07:00
Razgriz
52d29d42bb Merge pull request #1955 from CHOMPStationBot/upstream-merge-9969
[MIRROR] Adds in Booze hounds.
2021-06-26 13:23:49 -07:00
Razgriz
bdb955feff stop pUTTING CHOMP ICONS IN VR FILES 2021-06-25 01:29:32 -07:00
Razgriz
45c9f96537 POWDER THAT MAKES YOU SAY YW 2021-06-24 18:46:26 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Nadyr
8f9786e8c2 Merge branch 'master' into upstream-merge-10704 2021-06-19 22:01:09 -04:00
Nadyr
a9d5ef0fbc Merge pull request #2241 from CHOMPStationBot/upstream-merge-10694
[MIRROR] [MIRROR] Refactors utensils to use weakrefs
2021-06-19 21:59:34 -04:00
Nadyr
f0c2544f17 Merge pull request #2231 from CHOMPStationBot/upstream-merge-10652
[MIRROR] Porting Over De-Husking Surgery
2021-06-19 21:58:37 -04:00
Nadyr
1d2b8edac6 Merge pull request #2239 from CHOMPStationBot/upstream-merge-10703
[MIRROR] Fixes observers being able to open vore eggs
2021-06-19 21:52:11 -04:00
Nadyr
2108ac7c65 powder that makes you say yes 2021-06-19 21:43:57 -04:00
Nadyr
374e896bfc Merge pull request #2212 from CHOMPStationBot/upstream-merge-10660
[MIRROR] ITV Merchandise (Talon Gear)
2021-06-19 21:25:44 -04:00
Chompstation Bot
3b9ba4e1fc Really fixes eggs being operable by ghosts 2021-06-19 15:23:53 +00:00
Novacat
571025d718 Merge pull request #10694 from VOREStation/upstream-merge-8140
[MIRROR] Refactors utensils to use weakrefs
2021-06-19 13:44:00 +00:00
Novacat
9c1ce64978 Merge pull request #10703 from Verkister/patch-58
Fixes observers being able to open vore eggs
2021-06-19 13:31:34 +00:00
Chompstation Bot
4b89d37b6d Porting Over De-Husking Surgery 2021-06-18 21:07:55 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
52be7df6fc ITV Merchandise (Talon Gear) 2021-06-17 19:50:08 +00:00
Aronai Sieyes
4edcaa7908 Merge pull request #10611 from VOREStation/upstream-merge-8123
[MIRROR] stops armour plate and armour plate inserts having the same name, and…
2021-06-11 19:22:01 +00:00
Novacat
4f546ba6f7 Merge pull request #10598 from klaasjared/explo-duffle-fix
Exploration Duffle Fix
2021-06-09 14:42:19 +00:00
Nadyr
4db0aee294 Merge pull request #2150 from CHOMPStationBot/upstream-merge-10584
[MIRROR] Explorer storage items
2021-06-08 01:39:37 -04:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04:00
Chompstation Bot
e846fa7b82 [MIRROR] Adds new UI for secure stuff 2021-06-07 05:32:43 +00:00
Aronai Sieyes
958558168b Merge pull request #10529 from VOREStation/Fixes/10526
Fixes #10526
2021-06-02 16:00:10 +00:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Nadyr
92e1743b5c Merge branch 'master' into upstream-merge-10401 2021-05-27 22:40:15 -04:00
Nadyr
d20b48d2a3 powder that makes you say yes 2021-05-27 22:00:18 -04:00
Chompstation Bot
d76e756e5f [MIRROR] Reverts recipe changes from Industrial Expansion 2021-05-27 17:17:01 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Nadyr
3beacb065e Merge pull request #2011 from CHOMPStationBot/upstream-merge-10398
[MIRROR] [MIRROR] Wall-mounted Geiger Counters
2021-05-23 23:05:11 -04:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +00:00
Novacat
53fae19217 Merge pull request #10391 from ShadowLarkens/rpd_fix
Fix only the first RPD ever interacted with working
2021-05-23 16:31:01 +00:00
Nadyr
5f60a47e86 Merge pull request #1990 from CHOMPStationBot/upstream-merge-10368
[MIRROR] [MIRROR] Food 4 thought
2021-05-21 18:59:31 -04:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083
[MIRROR] Food 4 thought
2021-05-21 20:00:24 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
2021-05-20 19:05:42 +00:00
Novacat
23d3beed44 Merge pull request #10344 from KillianKirilenko/kk-misc2
Explorer/Pilot ID & Locker Addons
2021-05-17 16:55:19 +00:00
Nadyr
e157d0bf79 Merge pull request #1939 from CHOMPStationBot/upstream-merge-10257
[MIRROR] Changes some Exploration Colors
2021-05-11 23:56:27 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Novacat
2027165318 Merge pull request #10257 from Novacat/nova-ert
Changes some Exploration Colors
2021-05-11 13:07:03 +00:00
Novacat
7c0a30ab09 Merge pull request #10276 from VOREStation/upstream-merge-8069
[MIRROR] The Personal Computer Unit
2021-05-11 13:06:43 +00:00
Nadyr
e0f6cb84c9 Merge branch 'master' into upstream-merge-10050 2021-05-09 06:13:32 -04:00
Aronai Sieyes
93124538dd Merge pull request #10178 from dwinters99/light-replacer
New belt items
2021-05-06 17:58:51 +00:00
Chompstation Bot
55cb88b4a9 [MIRROR] Ported the Bay/Nebula emote system. 2021-05-05 18:45:31 +00:00