Commit Graph

1655 Commits

Author SHA1 Message Date
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518
[MIRROR] Ports musical instruments from /tg/
2021-06-02 02:54:38 -04:00
Nadyr
4fba3e19fb delete yw file conflicting with upstream music changes 2021-06-02 00:21:18 -04:00
Nadyr
095156f9e4 powder that makes you say yes 2021-06-01 23:35:20 -04:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master
explo vender stuff
2021-06-01 14:58:32 +00:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Nadyr
366fd4f97b Merge pull request #2086 from CHOMPStationBot/upstream-merge-10479
[MIRROR] Ports Runechat
2021-05-31 03:11:13 -04:00
Aronai Sieyes
9134933442 Allow multiple SStranscore databases (#10450)
* Allow multiple SStranscore databases

* Add key to backup implanter too

* Key passing tweak

* Fix issue Leshana spotted

* Add optimization Leshana spotted

* Fixxy more multitranscore bugs
2021-05-30 22:53:28 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
92e1743b5c Merge branch 'master' into upstream-merge-10401 2021-05-27 22:40:15 -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
Novacat
de885495b6 Merge pull request #10406 from Screemonster/contranslocatorband
Removes contraband descriptor from translocators.
2021-05-24 05:29:56 +00:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +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
111cd2a1ad Merge pull request #10328 from klaasjared/pilot_fix
Pilot Headset Fix
2021-05-15 11:56:58 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04: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
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Razgriz
3cba6aaab2 Update intercom.dm 2021-03-30 17:40:07 -07:00
Nadyr
4307a692e8 Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032
[MIRROR] Adminbus Area Modifications
2021-03-30 04:00:25 -04:00
Chompstation Bot
337acaa851 Adminbus Area Modifications 2021-03-29 17:22:38 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00: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
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
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Novacat
46506f23de Merge pull request #9968 from VOREStation/upstream-merge-7980
[MIRROR] GPS presentation/update tweaks/fixes.
2021-03-18 14:40:23 +00:00
Nadyr
d6cab496ed Merge pull request #1546 from CHOMPStationBot/upstream-merge-9867
[MIRROR] [MIRROR] Added a GPS compass.
2021-03-10 01:41:28 -05:00
Novacat
1d0ca9dd1e Merge pull request #9867 from VOREStation/upstream-merge-7928
[MIRROR] Added a GPS compass.
2021-03-09 22:59:48 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
cacb1f019d Gateway for Heads, Pilot to Civ 2021-03-08 16:05:16 +00:00
Nadyr
3bd7e2b888 Merge pull request #1320 from CHOMPStationBot/upstream-merge-9704
[MIRROR] [MIRROR] Telecrystals are only stored on the mind
2021-03-06 01:31:07 -05:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Sharkmare
e87bc13ef0 Adds ability ot changed folded pai access
Allows PAI access to be changed in folded form.

This is literally just a copy paste job with the variable paths changed.

Origin code can be found in pai.dm
2021-02-19 13:03:03 +01:00
Chompstation Bot
653d2b9179 Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled) 2021-02-14 08:51:59 -05:00
Chompstation Bot
24b712ec4d [MIRROR] Telecrystals are only stored on the mind 2021-02-13 21:26:38 +00:00
Verkister
ac8a77dd06 Merge pull request #9612 from VOREStation/upstream-merge-7839
[MIRROR] Fixed global_announce autospeaker
2021-02-10 10:11:30 +00:00
cadyn
fe84e96797 Revert "Delete defib timer" 2021-01-24 22:48:39 -08:00
cadyn
2fe77a59ac Revert "fixing defib timer and adding surgery for that shit" 2021-01-24 22:46:10 -08:00
Cadyn
4156dd8085 fixing defib timer and adding surgery for that shit 2021-01-24 21:27:44 -08:00
cadyn
5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
cadyn
c5ae5ec866 Merge pull request #1134 from CHOMPStation2/cadyn-patch-5
Delete defib timer
2021-01-24 06:52:37 -08:00
cadyn
4f9ed16579 Merge pull request #1165 from CHOMPStationBot/upstream-merge-9598
[MIRROR] Fixes defib timers being 10 times as long compared to intended.
2021-01-24 06:52:18 -08:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786
[MIRROR] Gadgets & Gizmos
2021-01-24 06:55:05 +00:00
Novacat
57e1be6caa Merge pull request #9598 from Heroman3003/defibfix
Fixes defib timers being 10 times as long compared to intended.
2021-01-24 06:34:15 +00:00
cadyn
c05d687ec2 Update defib.dm 2021-01-19 19:15:27 -08:00
cadyn
be3d2edf75 Update defib.dm 2021-01-16 22:40:20 -08:00
Novacat
a9f77823d7 Merge pull request #9333 from Tenryumi/nikki-fluff
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
2020-11-30 23:46:15 +00:00
Cadyn
49ae612dc4 Maybe forgot this 2020-11-25 19:44:55 -08:00
cadyn
f1c9b60bf8 Fuck okay maybe intercoms move sometimes 2020-11-24 23:24:36 -08:00
cadyn
d260757e91 yumyum radio go vroom hehe 2020-11-24 22:45:41 -08:00