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
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
a196e2c58e
Merge pull request #6243 from Citadel-Station-13/upstream-merge-36907
...
[MIRROR] Unit tests don't start until after 10s of round time
2018-04-03 08:15:33 +00:00
1013f3d92e
Merge pull request #6245 from Citadel-Station-13/upstream-merge-36490
...
[MIRROR] Archaeology... .... Code Cleanup (One day I promise!)
2018-04-03 08:15:12 +00:00
2a8196f618
Merge pull request #6246 from Citadel-Station-13/upstream-merge-36855
...
[MIRROR] implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo
2018-04-03 08:14:43 +00:00
496f73bc56
implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo ( #36855 )
...
* loyality
*fixed a bug that made coding relating to loyalty implants basically impossible
* did i say loyalty i meant mindshield
* and the .dme as well
this commit and last were webeditor but it should work
2018-04-02 19:46:01 -05:00
2d710e863f
Archaeology... .... Code Cleanup (One day I promise!) ( #36490 )
...
* Improves Arch Code
* defines and stack_traces null values
* relocates 2 defines to "non-signal" section
2018-04-02 18:14:15 -05:00
b428142e39
Removes april fools pitch shifting on admin music
2018-04-02 18:08:58 -05:00
376eee917a
Unit tests don't start until after 10s of round time ( #36907 )
2018-04-02 14:57:18 -05:00
2d5874d292
Merge pull request #6238 from Citadel-Station-13/upstream-merge-36888
...
[MIRROR] Removes unecessary compares in turf atmos init
2018-04-02 09:11:59 -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
82a3b2d872
Merge pull request #6237 from Citadel-Station-13/upstream-merge-36901
...
[MIRROR] Fixes morgue beeper message
2018-04-02 08:59:10 -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
16896254cf
Merge pull request #36888 from Robustin/initatmos
...
Removes unecessary compares in turf atmos init
2018-04-02 08:33:48 -05:00
5142076ea7
Merge pull request #36901 from KorPhaeron/beeper
...
Fixes morgue beeper message
2018-04-02 08:32:33 -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
9045de2c90
Merge pull request #6204 from Citadel-Station-13/upstream-merge-36873
...
[MIRROR] Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle.
2018-04-02 05:41:19 -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
242fd0556d
Merge pull request #6230 from Citadel-Station-13/upstream-merge-36875
...
[MIRROR] adds a sprite to the "show roundend report" button
2018-04-02 05:22:20 -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
b87addc531
adds a sprite to the "show roundend report" button ( #36875 )
...
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089 )
* bingo bongo i dont wanna leave the congo i REFUSE to go
* wjhon approval
2018-04-01 21:51:08 -05:00
a9c91b4d00
Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689
...
[MIRROR] Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam
2018-04-01 19:51:58 -05:00
022ac2e6c3
Merge pull request #6178 from Citadel-Station-13/shit
...
sanity
2018-04-01 19:51:39 -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
28e188cbbe
Merge pull request #6169 from Citadel-Station-13/upstream-merge-36722
...
[MIRROR] Fix 512-only code in recent conveyor belt fix
2018-04-01 19:49:55 -05:00
31bb211cb3
Update communications.dm
2018-04-01 19:48:15 -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
661f8b3468
Merge pull request #6217 from Citadel-Station-13/upstream-merge-36851
...
[MIRROR] Adds singular_name to BS polycrystals
2018-04-01 17:47:37 -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
982eef4158
Merge pull request #6227 from Citadel-Station-13/upstream-merge-36524
...
[MIRROR] Walls made entirely of wood!
2018-04-01 17:46:45 -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
deathride58