fd5b2f094f
[MIRROR] Moves material stacks to modules/materials
2021-04-28 16:38:58 +00:00
97140d5311
Merge pull request #1832 from CHOMPStationBot/upstream-merge-10175
...
[MIRROR] Changes blueprints to use ChangeArea
2021-04-21 21:45:13 -07:00
d25749a8b3
Merge pull request #10175 from Novacat/nova-ert
...
Changes blueprints to use ChangeArea
2021-04-20 22:41:11 +00:00
2856028342
Captain's Rapier
2021-04-20 16:50:56 +00:00
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
588179bd66
Remove unnecessary 'signatures'
2021-04-08 16:48:30 +00:00
1c6390c1e3
Merge pull request #1706 from CHOMPStationBot/upstream-merge-10046
...
[MIRROR] [MIRROR] Tanning Tweaks
2021-04-02 23:29:50 -04:00
3cba6aaab2
Update intercom.dm
2021-03-30 17:40:07 -07:00
0001021815
[MIRROR] Tanning Tweaks
2021-03-30 20:55:26 +00:00
4307a692e8
Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032
...
[MIRROR] Adminbus Area Modifications
2021-03-30 04:00:25 -04:00
9e24887a57
Update weldbackpack_ch.dm
2021-03-30 01:33:29 -04:00
a777f6993d
Merge branch 'master' into upstream-merge-10025
2021-03-30 00:58:05 -04:00
337acaa851
Adminbus Area Modifications
2021-03-29 17:22:38 +00:00
e9ff8803ae
Update station_ids_vr.dm
2021-03-28 22:05:26 -04:00
149f222644
MORE ALT ID STUFF
2021-03-28 23:59:28 +00:00
1ad694dcf0
[MIRROR] Repathed/renamed seromi to teshari.
2021-03-28 21:33:04 +00:00
3c692ed159
Merge branch 'master' into upstream-merge-10018
2021-03-28 00:05:29 -04:00
9de40aacb1
Merge pull request #1667 from CHOMPStationBot/upstream-merge-10016
...
[MIRROR] Adds alternative ID cards!
2021-03-27 23:50:28 -04:00
f6049a256a
Merge branch 'master' into upstream-merge-10007
2021-03-27 23:13:57 -04:00
ace9beb3d1
Delete id_stacks_deptname.dm
2021-03-27 22:59:17 -04:00
04f4302dfa
Delete id_stacks_cit.dm
2021-03-27 22:58:50 -04:00
a8e03b8061
Merge branch 'master' into upstream-merge-10008
2021-03-27 22:31:57 -04:00
2133df1507
Merge branch 'master' into upstream-merge-10002
2021-03-27 22:03:57 -04:00
8c01fbb78d
Merge pull request #1655 from CHOMPStationBot/upstream-merge-9989
...
[MIRROR] [MIRROR] New ID Card Design
2021-03-27 21:52:28 -04:00
e98859942f
Merge branch 'master' into upstream-merge-9974
2021-03-26 03:57:31 -04:00
4ce40dad53
Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955
...
[MIRROR] [MIRROR] Added think-tanks.
2021-03-26 03:50:02 -04:00
7524088a39
Removes redundant sprite_stack definitions from ID files
2021-03-25 18:36:40 +00:00
2b00accc0b
Merge pull request #10016 from Very-Soft/altids
...
Adds alternative ID cards!
2021-03-25 12:12:51 +00:00
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
f249133c88
[MIRROR] Patches new ID card code
2021-03-24 18:17:46 +00:00
320209f31e
Fixes gold IDs somehow having forgotten the sprites
2021-03-23 21:13:23 +00:00
abc800056c
[MIRROR] New ID Card Design
2021-03-23 16:15:59 +00:00
9c209652a9
Merge pull request #9988 from VOREStation/upstream-merge-7973
...
[MIRROR] News Update + Communicator Lag Fix
2021-03-21 21:25:45 +00:00
2a5c21c8f5
[MIRROR] Kaleidoscope 2: The Retabbening
2021-03-21 01:24:14 -04:00
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
2915e36ee8
[MIRROR] Tachikoma tweaks.
2021-03-19 09:44:42 +00:00
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
b7b8682e7c
[MIRROR] Added think-tanks.
2021-03-18 14:57:26 +00:00
46506f23de
Merge pull request #9968 from VOREStation/upstream-merge-7980
...
[MIRROR] GPS presentation/update tweaks/fixes.
2021-03-18 14:40:23 +00:00
5c285eda7d
Merge pull request #1595 from ZVB334/Weldpackfix
...
Fixes Teshari Welderbackpack Sprite
2021-03-17 03:33:50 -07:00
6e171d3182
Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396
...
[MIRROR] [MIRROR] Matter Matters
2021-03-16 22:22:28 -07:00
4baf7186fd
Fixes Teshari Welderbackpack Sprite
2021-03-12 11:20:26 -06:00
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
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
9098ecbda9
Merge pull request #9889 from VOREStation/upstream-merge-7949
...
[MIRROR] E-cigarette improvements
2021-03-10 19:07:18 +00:00
d6cab496ed
Merge pull request #1546 from CHOMPStationBot/upstream-merge-9867
...
[MIRROR] [MIRROR] Added a GPS compass.
2021-03-10 01:41:28 -05:00
604b71d59b
Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620
...
[MIRROR] [MIRROR] Industrial Expansion
2021-03-10 01:05:16 -05:00
0131f176f1
Update frame.dm
2021-03-10 00:29:09 -05:00
1d0ca9dd1e
Merge pull request #9867 from VOREStation/upstream-merge-7928
...
[MIRROR] Added a GPS compass.
2021-03-09 22:59:48 +00:00
b85e9fc4d9
[MIRROR] Industrial Expansion
2021-03-09 21:53:03 +00:00
Chompstation Bot