shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,399 Commits 5 Branches 0 Tags
8ad42c519af348f5df1fd6670e9c19c7dca74776
Commit Graph

9732 Commits

Author SHA1 Message Date
deathride58
8ad42c519a Merge pull request #6261 from Citadel-Station-13/upstream-merge-36928 
[MIRROR] Removes @
 2018-04-04 21:12:45 +00:00
deathride58
ef7b79eea7 Merge pull request #6262 from Citadel-Station-13/upstream-merge-36945 
[MIRROR] Removes april fools from heirlooms
 2018-04-04 21:12:26 +00:00
deathride58
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
deathride58
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
deathride58
3b35c63027 Merge pull request #6265 from Citadel-Station-13/upstream-merge-36932 
[MIRROR] Fixes asphyxiation disease activating early and ignoring transmission
 2018-04-04 21:11:07 +00:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
fludd12
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
vuonojenmustaturska
4b505112fc fixes revenant deadchat 2018-04-04 09:07:06 -05:00
Jordan Brown
057d10f654 Fixes chem macros with trailing ; 2018-04-04 09:04:53 -05:00
vuonojenmustaturska
77e51603d4 move enforce_human_authority check before species.before_equip_job() 2018-04-04 09:03:37 -05:00
Jordie
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
Jordan Brown
3c7d2c0ab9 Merge pull request #36932 from SailorDave/asphyxiation-fix 
Fixes asphyxiation disease activating early and ignoring transmission
 2018-04-03 23:46:28 -05:00
YPOQ
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
robbym
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
Jordie
5614da1d3b Merge pull request #36945 from KorPhaeron/aprilfools 
Removes april fools from heirlooms
 2018-04-03 22:03:04 -05:00
Jordan Brown
20f7370ea3 Removes @ (#36928) 2018-04-03 22:02:55 -05:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
iksyp
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
Grandmother of 50
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
oranges
b428142e39 Removes april fools pitch shifting on admin music 2018-04-02 18:08:58 -05:00
Jordan Brown
376eee917a Unit tests don't start until after 10s of round time (#36907) 2018-04-02 14:57:18 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
Jordan Brown
383b0d1214 Merge pull request #36905 from Jordie0608/thisreadmepredatesgooglecodeitsprobablyolderthansomeplayers 
Removes ancient library readme file
 2018-04-02 08:37:15 -05:00
Jordan Brown
16896254cf Merge pull request #36888 from Robustin/initatmos 
Removes unecessary compares in turf atmos init
 2018-04-02 08:33:48 -05:00
Jordan Brown
5142076ea7 Merge pull request #36901 from KorPhaeron/beeper 
Fixes morgue beeper message
 2018-04-02 08:32:33 -05:00
Jordan Brown
0dc793129d Merge pull request #36902 from KorPhaeron/dronevision 
Fixes drone night vision
 2018-04-02 08:32:23 -05:00
Jordan Brown
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
Kyle Spier-Swenson
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
LetterJay
7de2934a26 Merge pull request #6210 from Citadel-Station-13/upstream-merge-36834 
[MIRROR] Removes advanced darkness
 2018-04-02 06:58:18 -05:00
LetterJay
66420d8504 Merge pull request #6116 from cebutris/moreminerloot 
adds lavaknight corpses to legion drops
 2018-04-02 05:47:30 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
kevinz000
91f9596eec damnit (#36886) 2018-04-02 02:13:03 -05:00
CitadelStationBot
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
Jordan Brown
4c97bc84e7 Merge pull request #36721 from GrayRachnid/fix-crafting-tools 
Fix crafting tools tooltips
 2018-04-01 22:02:46 -05:00
MrDoomBringer
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
LetterJay
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