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
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
Chompstation Bot
b7b8682e7c
[MIRROR] Added think-tanks.
2021-03-18 14:57:26 +00:00
ZVB334
4baf7186fd
Fixes Teshari Welderbackpack Sprite
2021-03-12 11:20:26 -06:00
Nadyr
9be6ad7774
Merge pull request #1562 from CHOMPStationBot/upstream-merge-9897
...
[MIRROR] [MIRROR] Tweaked implant loadout, refactored implant detection.
2021-03-11 00:52:13 -05:00
Novacat
4631c4faca
Merge pull request #9897 from VOREStation/upstream-merge-7963
...
[MIRROR] Tweaked implant loadout, refactored implant detection.
2021-03-10 19:40:33 +00:00
Novacat
9098ecbda9
Merge pull request #9889 from VOREStation/upstream-merge-7949
...
[MIRROR] E-cigarette improvements
2021-03-10 19:07:18 +00:00
Nadyr
604b71d59b
Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620
...
[MIRROR] [MIRROR] Industrial Expansion
2021-03-10 01:05:16 -05:00
Nadyr
0131f176f1
Update frame.dm
2021-03-10 00:29:09 -05:00
Chompstation Bot
b85e9fc4d9
[MIRROR] Industrial Expansion
2021-03-09 21:53:03 +00:00
Chompstation Bot
598a7814e8
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
2021-03-09 20:17:06 +00:00
Novacat
955be2e5fe
Merge pull request #9876 from VOREStation/upstream-merge-7953
...
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 16:53:20 +00:00
Nadyr
81c2f9dac9
Merge pull request #1510 from Holdelta/MiningAdditions
...
Mining additions
2021-03-07 22:09:06 -05:00
Test Turtle
5ff44857e0
satchel of holding added
2021-03-06 17:34:10 -08:00
Test Turtle
875c71f157
Adding and re-adding quality-of-life items to mining
...
Given that we are to be more action-oriented, I believe that mining could do with a few small updates from more action-oriented servers.
- Adds larger ore satchels
- Adds(re-adds?) cooldown upgrades for kinetic accelerator
- Re-adds the diamond pickaxe
2021-03-06 16:40:13 -08:00
Novacat
5e1080b5eb
Merge pull request #9863 from Heroman3003/macronerf
...
Removes advantage macrotaurs have with saddlebag slowdown.
2021-03-06 23:20:33 +00:00
Nadyr
324621325b
Merge branch 'master' into upstream-merge-9747
2021-03-06 00:17:54 -05:00
Novacat
7f7c5873d6
Merge pull request #9814 from VOREStation/upstream-merge-7820
...
[MIRROR] Adds the Restraining Bolt.
2021-02-28 23:16:43 +00:00
Nadyr
1acad29320
Merge pull request #1400 from CHOMPStationBot/upstream-merge-9791
...
[MIRROR] Updates bar book to fix styling error, updates placement and removes outdated bar book.
2021-02-28 07:32:06 -05:00
