Commit Graph

3668 Commits

Author SHA1 Message Date
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +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
Chompstation Bot
2856028342 Captain's Rapier 2021-04-20 16:50:56 +00:00
Shadowfire
71daa80a80 Implants and Mechs from a dispenser? Oh my!
Added prizes to casino, and also small rework for streamlining of ckey work. Poor Kassc has to spend hours adding hundreds of items for you guys to enjoy after these casino events!
2021-04-15 01:14:06 +02:00
Nadyr
9e24887a57 Update weldbackpack_ch.dm 2021-03-30 01:33:29 -04:00
Nadyr
a777f6993d Merge branch 'master' into upstream-merge-10025 2021-03-30 00:58:05 -04:00
Nadyr
e9ff8803ae Update station_ids_vr.dm 2021-03-28 22:05:26 -04:00
Chompstation Bot
149f222644 MORE ALT ID STUFF 2021-03-28 23:59:28 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Nadyr
3c692ed159 Merge branch 'master' into upstream-merge-10018 2021-03-28 00:05:29 -04:00
Nadyr
9de40aacb1 Merge pull request #1667 from CHOMPStationBot/upstream-merge-10016
[MIRROR] Adds alternative ID cards!
2021-03-27 23:50:28 -04:00
Nadyr
f6049a256a Merge branch 'master' into upstream-merge-10007 2021-03-27 23:13:57 -04:00
Nadyr
ace9beb3d1 Delete id_stacks_deptname.dm 2021-03-27 22:59:17 -04:00
Nadyr
04f4302dfa Delete id_stacks_cit.dm 2021-03-27 22:58:50 -04:00
Nadyr
a8e03b8061 Merge branch 'master' into upstream-merge-10008 2021-03-27 22:31:57 -04:00
Nadyr
2133df1507 Merge branch 'master' into upstream-merge-10002 2021-03-27 22:03:57 -04:00
Nadyr
8c01fbb78d Merge pull request #1655 from CHOMPStationBot/upstream-merge-9989
[MIRROR] [MIRROR] New ID Card Design
2021-03-27 21:52:28 -04:00
Nadyr
e98859942f Merge branch 'master' into upstream-merge-9974 2021-03-26 03:57:31 -04:00
Nadyr
4ce40dad53 Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955
[MIRROR] [MIRROR] Added think-tanks.
2021-03-26 03:50:02 -04:00
Chompstation Bot
7524088a39 Removes redundant sprite_stack definitions from ID files 2021-03-25 18:36:40 +00:00
Novacat
2b00accc0b Merge pull request #10016 from Very-Soft/altids
Adds alternative ID cards!
2021-03-25 12:12:51 +00:00
Chompstation Bot
f825d5ca9f Fixes Fluff and ITG ID cards, refactors event/fluff IDs a lil', also fixes for digested id icons 2021-03-24 18:51:25 +00:00
Chompstation Bot
f249133c88 [MIRROR] Patches new ID card code 2021-03-24 18:17:46 +00:00
Chompstation Bot
320209f31e Fixes gold IDs somehow having forgotten the sprites 2021-03-23 21:13:23 +00:00
Chompstation Bot
abc800056c [MIRROR] New ID Card Design 2021-03-23 16:15:59 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00