Arokha Sieyes
|
47ccc655db
|
Deprecate the stream operator
|
2020-02-12 19:38:43 -05: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
|
1f9cd76d6e
|
Merge pull request #6563 from VOREStation/upstream-merge-6685
[MIRROR] Unmaps distro pressure regulators
|
2020-02-12 10:41:43 -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 |
|
Novacat
|
58aca938a3
|
Merge pull request #6561 from VOREStation/upstream-merge-6684
[MIRROR] Very low levels of radiation are no longer harmful
|
2020-02-12 10:41:11 -05:00 |
|
Atermonera
|
97dad68bd2
|
Unmaps distro pressure regulators
|
2020-02-12 00:19:24 -05:00 |
|
VirgoBot
|
cd0a76d0e3
|
Shutoff monitoring console remotely controls valves
|
2020-02-12 00:17:09 -05:00 |
|
Atermonera
|
3961c4cdbf
|
Shutoff monitoring console remotely controls valves (#6687)
|
2020-02-12 00:17:09 -05:00 |
|
VirgoBot
|
25be3063a4
|
Very low levels of radiation are no longer harmful
|
2020-02-12 00:15:55 -05:00 |
|
Atermonera
|
cb75ffdc72
|
Very low levels of radiation are no longer harmful (#6684)
|
2020-02-12 00:15:55 -05:00 |
|
Novacat
|
1d53ced4a3
|
Merge pull request #6559 from Heroman3003/morfix4
Fixes morph spawn event bugs
|
2020-02-11 23:17:36 -05:00 |
|
Heroman
|
3f75b09ea2
|
Fixes morph spawn event bugs
|
2020-02-12 12:36:22 +10:00 |
|
Novacat
|
8c5fb2fa84
|
Merge pull request #6558 from VOREStation/upstream-merge-6666
[MIRROR] Applies same restrictions as first aid to external synth repair
|
2020-02-10 19:09:03 -05: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 |
|
Novacat
|
0af93e57cc
|
Merge pull request #6557 from VOREStation/upstream-merge-6667
[MIRROR] Prevents surgery from being done while wearing a voidsuit
|
2020-02-10 16:42:49 -05:00 |
|
VirgoBot
|
0ad6cb36ad
|
Prevents surgery from being done while wearing a voidsuit
|
2020-02-10 16:03:04 -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 |
|
Novacat
|
abd1424ffc
|
Merge pull request #6492 from Heroman3003/belt-mining
Fixes and re-implements Rogue Mining (Belt Mining)
|
2020-02-10 10:48:34 -05:00 |
|
Heroman3003
|
6a75d126b2
|
Merge branch 'master' into superpod
|
2020-02-10 23:08:57 +10:00 |
|
Heroman
|
5990e3341e
|
Conflict resolution
|
2020-02-10 23:07:00 +10:00 |
|
Heroman3003
|
0d21e91b68
|
Merge branch 'master' into belt-mining
|
2020-02-10 22:47:42 +10:00 |
|
Heroman
|
695f34f5b9
|
Resolves conflicts
|
2020-02-10 22:44:45 +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 |
|
Novacat
|
33c13b4a28
|
Merge pull request #6551 from Heroman3003/pizza-un-nerf
Undoes unnecesary nerfs on pizzas
|
2020-02-10 00:48:02 -05:00 |
|
Novacat
|
869868e7f7
|
Merge pull request #6554 from VOREStation/upstream-merge-6675
[MIRROR] Logs graffiti and crayon drawings: Non-Cursed PR
|
2020-02-10 00:47:34 -05:00 |
|
VirgoBot
|
b5318ab287
|
Logs graffiti and crayon drawings: Non-Cursed PR
|
2020-02-09 23:45:06 -05:00 |
|
Atermonera
|
0bbc8109ae
|
Merge pull request #6675 from GeneriedJenelle/patch-1
Logs graffiti and crayon drawings: Non-Cursed PR
|
2020-02-09 23:45:06 -05:00 |
|
Heroman
|
d841259cf3
|
Adds logging to the breaking of devourable/feeding prefs
|
2020-02-10 13:43:35 +10:00 |
|
Heroman
|
8822a40adf
|
adjust comments
|
2020-02-10 13:06:43 +10:00 |
|
Heroman
|
3e5d2abb43
|
Removes magic dust from random reagents accessible via randomized seeds
|
2020-02-10 12:53:15 +10:00 |
|
Heroman
|
292a403d6a
|
Undoes unnecesary nerfs on pizzas
|
2020-02-10 10:01:02 +10:00 |
|
Novacat
|
c093f2c54a
|
Merge pull request #6550 from VOREStation/upstream-merge-6662
[MIRROR] Stunbatons will now only harmbaton on grab/harm intents
|
2020-02-09 17:39:16 -05:00 |
|
VirgoBot
|
76b9587132
|
Stunbatons will now only harmbaton on grab/harm intents
|
2020-02-09 14:47:00 -05:00 |
|
Atermonera
|
7b20362aaf
|
Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change
Stunbatons will now only harmbaton on grab/harm intents
|
2020-02-09 14:47:00 -05:00 |
|
Novacat
|
7a704616ea
|
Merge pull request #6544 from VOREStation/upstream-merge-6665
[MIRROR] 2020 Civilian Wing Overhaul
|
2020-02-08 16:44:36 -05:00 |
|
Novacat
|
a513230b57
|
Merge pull request #6548 from Meghan-Rossi/upstream-merge-6665
fix conflict causing compile error
|
2020-02-08 16:03:40 -05:00 |
|
Novacat
|
d91c8ec074
|
Merge pull request #6546 from VOREStation/upstream-merge-6677
[MIRROR] ATMs can now be emagged
|
2020-02-08 15:56:58 -05:00 |
|
Novacat
|
e9435567dd
|
Merge pull request #6545 from VOREStation/upstream-merge-6673
[MIRROR] Fixes Jumpskirt Sprites
|
2020-02-08 15:56:43 -05:00 |
|
Novacat
|
22c0fd363f
|
Update bed.dm
|
2020-02-08 15:56:26 -05:00 |
|
Novacat
|
53842f87c7
|
Merge pull request #6547 from VOREStation/upstream-merge-6676
[MIRROR] Fix frame deconstruction bugs
|
2020-02-08 15:55:59 -05:00 |
|
Meghan-Rossi
|
3935aa3e47
|
fix conflict causing compile error
|
2020-02-08 19:32:03 +00:00 |
|
VirgoBot
|
970a4a6437
|
Fix frame deconstruction bugs
|
2020-02-08 14:03:53 -05:00 |
|