Commit Graph

5875 Commits

Author SHA1 Message Date
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
Razgriz
c4ca47fb5e Merge pull request #1936 from CHOMPStationBot/upstream-merge-10276
[MIRROR] [MIRROR] The Personal Computer Unit
2021-05-11 15:51:54 -07: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
Novacat
ff41a0fc27 Merge pull request #10269 from Heroman3003/jam-them-sensors
Adds Jams Sensors belly mode addon
2021-05-09 12:55:44 +00:00
Nadyr
e0f6cb84c9 Merge branch 'master' into upstream-merge-10050 2021-05-09 06:13:32 -04:00
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236
[MIRROR] Toys expansion
2021-05-08 23:50:05 -04:00
Nadyr
c1e068bd90 Update toys_vr.dm 2021-05-08 08:29:58 -04:00
Nadyr
375167cd63 Merge pull request #1907 from CHOMPStationBot/upstream-merge-10178
[MIRROR] New belt items
2021-05-08 08:11:11 -04:00
Aronai Sieyes
93124538dd Merge pull request #10178 from dwinters99/light-replacer
New belt items
2021-05-06 17:58:51 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys
Toys expansion
2021-05-06 14:42:49 +00:00
Chompstation Bot
55cb88b4a9 [MIRROR] Ported the Bay/Nebula emote system. 2021-05-05 18:45:31 +00:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00
Razgriz
97140d5311 Merge pull request #1832 from CHOMPStationBot/upstream-merge-10175
[MIRROR] Changes blueprints to use ChangeArea
2021-04-21 21:45:13 -07:00
Novacat
d25749a8b3 Merge pull request #10175 from Novacat/nova-ert
Changes blueprints to use ChangeArea
2021-04-20 22:41:11 +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
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Nadyr
1c6390c1e3 Merge pull request #1706 from CHOMPStationBot/upstream-merge-10046
[MIRROR] [MIRROR] Tanning Tweaks
2021-04-02 23:29:50 -04:00
Razgriz
3cba6aaab2 Update intercom.dm 2021-03-30 17:40:07 -07:00
Chompstation Bot
0001021815 [MIRROR] Tanning Tweaks 2021-03-30 20:55:26 +00:00
Nadyr
4307a692e8 Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032
[MIRROR] Adminbus Area Modifications
2021-03-30 04:00:25 -04: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
Chompstation Bot
337acaa851 Adminbus Area Modifications 2021-03-29 17:22:38 +00: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
Novacat
9c209652a9 Merge pull request #9988 from VOREStation/upstream-merge-7973
[MIRROR] News Update  + Communicator Lag Fix
2021-03-21 21:25:45 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Razgriz
202651b317 Merge pull request #1629 from CHOMPStationBot/upstream-merge-9973
[MIRROR] [MIRROR] Makes custom cigarettes even more custom-ier
2021-03-19 22:44:13 -07:00
Chompstation Bot
2915e36ee8 [MIRROR] Tachikoma tweaks. 2021-03-19 09:44:42 +00:00
Novacat
a4bf657c59 Merge pull request #9973 from VOREStation/upstream-merge-7925
[MIRROR] Makes custom cigarettes even more custom-ier
2021-03-19 07:48:42 +00:00