Commit Graph

36118 Commits

Author SHA1 Message Date
Novacat
af6a2b5e55 Merge pull request #6583 from VOREStation/upstream-merge-6693
[MIRROR] Fixes mining borg ore box movement astral sorcery
2020-02-17 11:45:26 -05:00
Rykka
39567d75e2 EARLYPORT: Fix Air Pump loop sound stacking multiple times per pump.
Turns out that the # was so, so, so far off. It was acting as if it was 0.4 seconds per loop, for an 11 SECOND SOUND FILE.

My bad.
Earlyport of https://github.com/PolarisSS13/Polaris/pull/6700
2020-02-17 02:59:13 -07:00
Novacat
33570d10e6 Update ore_box.dm 2020-02-17 01:33:15 -05:00
Novacat
332e3271d9 Update ore_box.dm 2020-02-17 01:31:48 -05:00
Novacat
e8526a420c Update robot.dm 2020-02-17 01:30:10 -05:00
Novacat
5ea36b7a60 Update robot_movement.dm 2020-02-17 01:29:20 -05:00
Heroman3003
57b7302ea1 Fixes null empty supplypack appearing in last category (#6698) 2020-02-17 01:19:44 -05:00
Atermonera
c5b6dfa259 Fixes mining borg ore box movement astral sorcery 2020-02-17 01:18:31 -05:00
Unknown
a5f3776a91 adds _vr to trash pile 2020-02-17 00:01:50 -05:00
Unknown
b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
Heroman
ae21ea53f5 AND DELETES ORIGINAL 2020-02-16 04:58:48 +10:00
Heroman
10e3dd6368 Moves falling datum for pizza delviery to voucher file 2020-02-16 04:58:32 +10:00
Heroman
e162f75286 Adds pineapple pizza to pizza voucher pool 2020-02-16 04:55:40 +10:00
Novacat
106711b0f3 Merge pull request #6508 from VOREStation/Verkister-patch-7
A ban-flinging QoL update
2020-02-14 20:53:25 -05:00
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Novacat
db2e0bf71c Merge pull request #6573 from Heroman3003/hard-safety
Prevents resleeving sickness from affecting hardvore victims
2020-02-14 09:35:58 -05:00
Novacat
4f4a29b5fc Merge pull request #6568 from VOREStation/stream
Remove use of <<
2020-02-14 09:34:12 -05:00
Novacat
1c459d7416 Merge pull request #6572 from VOREStation/upstream-merge-6689
[MIRROR] cash registers and retail scanners show transaction totals on examine
2020-02-14 09:33:01 -05:00
Novacat
1c4d942f1b Merge pull request #6571 from VOREStation/upstream-merge-6682
[MIRROR] Adds pineapple pizza box
2020-02-14 09:32:40 -05:00
Atermonera
600e62d137 Fixes runtime in frame.dm, line 509: Cannot read null.len (#6691)
* Fixes runtime in frame.dm, line 509: Cannot read null.len

* Update frame.dm
2020-02-14 03:45:42 -05:00
Heroman
b09c8c5a38 Prevents resleeving sickness from affecting hardvore victims 2020-02-14 10:07:02 +10:00
Atermonera
20f60c4a8b cash registers and retail scanners show transaction totals on examine (#6689) 2020-02-13 17:11:53 -05:00
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Aronai Sieyes
641ed43b23 This one should be WRITE_LOG 2020-02-13 12:21:03 -05:00
Atermonera
cae97cf4c0 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas
Metamorphic Pint Glass
2020-02-13 00:31:59 -05:00
Arokha Sieyes
7f1aabbf25 Weird cases where to_chat freaks out 2020-02-12 19:38:45 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
0ebf8b163a Removes Crate Mimic from list of available maintenance preds 2020-02-13 09:40:29 +10:00
Heroman
5ba0e0805c Prevents the pred going buck wild if player leaves 2020-02-13 09:39:32 +10:00
Heroman
94b8236398 Fixes new tools on pupdozer being duplicated 2020-02-13 07:08:43 +10:00
Novacat
c8a8987610 Merge pull request #6524 from Heroman3003/beaconchange
Makes syndie beacon found in xenoarch use virgo-specific subtype
2020-02-12 10:43:24 -05:00
Novacat
d1dbefffc4 Merge pull request #6539 from Meghan-Rossi/bombtesttweak
Makes explosive simulators give slightly more helpful results for ttvs
2020-02-12 10:42:47 -05:00
Novacat
448526bfdc Merge pull request #6553 from Heroman3003/log-the-prefs
Adds logging to the breaking of devourable/feeding prefs
2020-02-12 10:42:28 -05:00
Novacat
a60e5cae18 Merge pull request #6562 from VOREStation/upstream-merge-6687
[MIRROR] Shutoff monitoring console remotely controls valves
2020-02-12 10:41:28 -05:00
Verkister
0afc30e8ac Update functions.dm 2020-02-12 15:19:53 +02:00
Atermonera
3961c4cdbf Shutoff monitoring console remotely controls valves (#6687) 2020-02-12 00:17:09 -05:00
Atermonera
cb75ffdc72 Very low levels of radiation are no longer harmful (#6684) 2020-02-12 00:15:55 -05:00
Heroman
3f75b09ea2 Fixes morph spawn event bugs 2020-02-12 12:36:22 +10:00
Heroman
8ac52fef61 Adds Maintenance Predator random event 2020-02-12 12:33:46 +10:00
Novacat
06b7651799 Update nanopaste.dm 2020-02-10 18:59:12 -05:00
Atermonera
6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Atermonera
571fe9f734 Merge pull request #6667 from Heroman3003/voidsuti-surgery
Prevents surgery from being done while wearing a voidsuit
2020-02-10 16:03:04 -05:00
Novacat
12a412be47 Merge pull request #6519 from Heroman3003/beltminecrate
QoL to supplypacks related to Belt Mining
2020-02-10 11:06:20 -05:00
Novacat
7933afeab7 Merge pull request #6511 from Heroman3003/superpod
Limits the locations at which drone pod can drop
2020-02-10 11:05:26 -05:00
Novacat
4cf3bd94be Merge pull request #6439 from lbnesquik/Kath-Nif-Tweak
Disable random blackouts during NIF adaptation
2020-02-10 10:49:54 -05:00
Heroman3003
6a75d126b2 Merge branch 'master' into superpod 2020-02-10 23:08:57 +10:00
Heroman3003
0d21e91b68 Merge branch 'master' into belt-mining 2020-02-10 22:47:42 +10:00
Spades
ddc544205d Merge pull request #6429 from Heroman3003/morphevent
Adds Morph Spawn event
2020-02-10 07:21:57 -05:00
Novacat
6130b3f9cb Merge pull request #6552 from Heroman3003/dusthide
Removes magic dust from random reagents accessible via randomized seeds
2020-02-10 01:13:46 -05:00
Heroman
ead75dbace Switches comments back to block edit 2020-02-10 15:52:29 +10:00