af8862bd78
Merge pull request #6263 from Citadel-Station-13/upstream-merge-36867
...
[MIRROR] Fixes 0 value not being saved in constant memory circuits
2018-04-04 21:11:44 +00:00
cd251d79b2
Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645
...
[MIRROR] Fixes mannitol not curing minor brain traumas
2018-04-04 21:11:28 +00:00
fdea6d88aa
Merge pull request #6266 from Citadel-Station-13/upstream-merge-36897
...
[MIRROR] Fixes errors with making temp rank changes before permanent ones
2018-04-04 21:10:47 +00:00
e6f411ae5d
Merge pull request #6268 from Citadel-Station-13/upstream-merge-36969
...
[MIRROR] move enforce_human_authority check before species.before_equip_job()
2018-04-04 21:04:30 +00:00
3eec79f992
Merge pull request #6269 from Citadel-Station-13/upstream-merge-36929
...
[MIRROR] Fixes chem macros with trailing ;
2018-04-04 21:02:22 +00:00
5f4509123c
Merge pull request #6271 from Citadel-Station-13/upstream-merge-36521
...
[MIRROR] Burning ores (from either fire or lava) now yields materials at a decreased rate.
2018-04-04 21:02:05 +00:00
fc9b02cbbb
Burning ores (from either fire or lava) now yields materials at a decreased rate. ( #36521 )
...
* Burning ores (from either fire or lava) now yields materials at a decreased rate.
* Randomizes the returns!
2018-04-04 12:00:57 -05:00
4b505112fc
fixes revenant deadchat
2018-04-04 09:07:06 -05:00
057d10f654
Fixes chem macros with trailing ;
2018-04-04 09:04:53 -05:00
77e51603d4
move enforce_human_authority check before species.before_equip_job()
2018-04-04 09:03:37 -05:00
00f5f70b1b
Fixes errors with making temp rank changes before permanent ones ( #36897 )
...
* fixes errors with making temp rank changes before permanent ones
* adds parenthesis
2018-04-03 23:51:45 -05:00
1ee5b349d7
Fixes mannitol not curing minor brain traumas ( #36645 )
...
* Fixes mannitol not curing brain traumas
* Makes has_trauma_type random, adds type arg to cure_trauma_type
* Adds get_traumas_type proc
* Default to /datum/brain_trauma
2018-04-03 22:03:20 -05:00
1e34269e0c
Fixes 0 value not being saved in constant memory circuits ( #36867 )
...
* Fixes 0 value not being saved in constant memory circuits
* Fixes 0 value not being loaded in constant memory circuits
* Switched to isnull proc for null checks
2018-04-03 22:03:12 -05:00
5dddb2db45
Merge pull request #6083 from Citadel-Station-13/upstream-merge-36149
...
[MIRROR] improves techwebs a bit
2018-04-03 08:16:59 +00:00
edccb8b3e4
Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442
...
[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!
2018-04-03 08:16:11 +00:00
b428142e39
Removes april fools pitch shifting on admin music
2018-04-02 18:08:58 -05:00
b9c9336cbf
Merge pull request #6240 from Citadel-Station-13/upstream-merge-36905
...
[MIRROR] Removes ancient library readme file
2018-04-02 09:01:04 -05:00
68a4a7d746
Merge pull request #6236 from Citadel-Station-13/upstream-merge-36902
...
[MIRROR] Fixes drone night vision
2018-04-02 08:57:18 -05:00
984c9f4d8e
Merge pull request #6235 from Citadel-Station-13/upstream-merge-36899
...
[MIRROR] Fixes an edge case with atmos gas mixture garbage collection
2018-04-02 08:55:56 -05:00
383b0d1214
Merge pull request #36905 from Jordie0608/thisreadmepredatesgooglecodeitsprobablyolderthansomeplayers
...
Removes ancient library readme file
2018-04-02 08:37:15 -05:00
0dc793129d
Merge pull request #36902 from KorPhaeron/dronevision
...
Fixes drone night vision
2018-04-02 08:32:23 -05:00
5b2df864e3
Merge pull request #36899 from vuonojenmustaturska/quantumsolace
...
Fixes an edge case with atmos gas mixture garbage collection
2018-04-02 08:31:11 -05:00
05ae1b304a
Cid randomizer check no longer triggers if the user's cid changes once then changes back ( #36887 )
...
* Cid randomizer check no longer triggers if the user's cid changes once then changes back
Normally, we only check for the randomizer if their cid changed from their last allowed connection. In some edge cases, somebody's cid can be different from a one time glitch, then change back on the next connection.
We now detect such cases and allow the connection.
* Update client_procs.dm
* Update client_procs.dm
2018-04-02 08:26:55 -05:00
7de2934a26
Merge pull request #6210 from Citadel-Station-13/upstream-merge-36834
...
[MIRROR] Removes advanced darkness
2018-04-02 06:58:18 -05:00
66420d8504
Merge pull request #6116 from cebutris/moreminerloot
...
adds lavaknight corpses to legion drops
2018-04-02 05:47:30 -05:00
af2cc17248
Merge pull request #6232 from Citadel-Station-13/upstream-merge-36886
...
[MIRROR] servant blockers no longer glitch out when deleted without force
2018-04-02 05:39:55 -05:00
daf2e6efa7
Merge pull request #6231 from Citadel-Station-13/upstream-merge-36721
...
[MIRROR] Fix crafting tools tooltips
2018-04-02 05:23:50 -05:00
91f9596eec
damnit ( #36886 )
2018-04-02 02:13:03 -05:00
dc7585fabf
[MIRROR] Moves quick equip hotkey up to /mob ( #6229 )
...
* Moves quick equip hotkey up to /mob
* Merge pull request #36869 from RandomMarine/e
Moves quick equip hotkey up to /mob
2018-04-02 01:36:42 -05:00
4c97bc84e7
Merge pull request #36721 from GrayRachnid/fix-crafting-tools
...
Fix crafting tools tooltips
2018-04-01 22:02:46 -05:00
7682dd2a7f
Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822
...
[MIRROR] Fixes monkey retaliation from beyond the grave
2018-04-01 19:51:17 -05:00
a5ec18d566
Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816
...
[MIRROR] Fixes mutant bodypart assignments
2018-04-01 19:50:58 -05:00
dd579e35bc
Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548
...
[MIRROR] Added a new ability to sentient diseases
2018-04-01 19:50:43 -05:00
f7be23e78a
Merge branch 'master' into upstream-merge-36442
2018-04-01 19:50:37 -05:00
57ed2fcb70
Merge pull request #6215 from Citadel-Station-13/iconstate
...
icon state fix for TechDemon core
2018-04-01 17:48:13 -05:00
b6873e9bd4
Merge pull request #6219 from Citadel-Station-13/upstream-merge-36857
...
[MIRROR] you can now walk through abductor table frames
2018-04-01 17:47:07 -05:00
7d1746a84a
Merge pull request #6226 from Citadel-Station-13/upstream-merge-36865
...
[MIRROR] adds a "the" to robo's supervisor in job description
2018-04-01 17:46:22 -05:00
2177a51a09
Merge pull request #6225 from Citadel-Station-13/upstream-merge-36856
...
[MIRROR] The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
2018-04-01 17:46:03 -05:00
f5b2315531
Merge pull request #6223 from Citadel-Station-13/upstream-merge-36885
...
[MIRROR] Fixes revenants being unable to siphon after failing a siphon
2018-04-01 17:45:41 -05:00
a11f0c4eb7
Merge pull request #6222 from Citadel-Station-13/upstream-merge-36829
...
[MIRROR] [s]Minor Refactor of click code, anti-auto clicker protection
2018-04-01 17:45:21 -05:00
64705aaf07
Merge pull request #6221 from Citadel-Station-13/upstream-merge-36864
...
[MIRROR] Cleaned up tile pointer circuit and converted to absolute coordinates
2018-04-01 17:45:04 -05:00
6d117d18a3
Update spellbook.dm
2018-04-01 17:44:04 -05:00
6b50b35897
Merge pull request #6140 from Citadel-Station-13/upstream-merge-36743
...
[MIRROR] Fixes modular computer ui_interact runtime
2018-04-01 17:41:34 -05:00
9bb405d27c
Merge pull request #6147 from Citadel-Station-13/upstream-merge-36738
...
[MIRROR] Nutriment can get you fat again.
2018-04-01 17:40:38 -05:00
c4ac6e63f7
Update combat.dm
2018-04-01 17:39:41 -05:00
5c817dfd01
Update humans.dm
2018-04-01 17:39:26 -05:00
4d0df4ab16
Merge pull request #36865 from factoryman942/master
...
adds a "the" to robo's supervisor in job description
2018-04-01 11:16:57 -05:00
9b8ca10da2
Merge pull request #36856 from iskyp/resin+egg
...
The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
2018-04-01 11:11:38 -05:00
a18aec6fa5
Fixes revenants being unable to siphon after failing a siphon
2018-04-01 08:33:39 -05:00
ae61521e67
Merge pull request #36829 from MrStonedOne/onclick_rework
...
[s]Minor Refactor of click code, anti-auto clicker protection
2018-04-01 08:24:12 -05:00
deathride58