shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,326 Commits 5 Branches 0 Tags
05ae1b304ad3fdcd677a55558f2bbf0ab4c1ea8d
Commit Graph

5712 Commits

Author SHA1 Message Date
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
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
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
57ed2fcb70 Merge pull request #6215 from Citadel-Station-13/iconstate 
icon state fix for TechDemon core
 2018-04-01 17:48:13 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
c4ac6e63f7 Update combat.dm 2018-04-01 17:39:41 -05:00
LetterJay
5c817dfd01 Update humans.dm 2018-04-01 17:39:26 -05:00
Jordan Brown
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
Jordan Brown
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
YPOQ
a18aec6fa5 Fixes revenants being unable to siphon after failing a siphon 2018-04-01 08:33:39 -05:00
vuonojenmustaturska
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
vuonojenmustaturska
cf3826f3bf Merge pull request #36864 from robbym/master 
Cleaned up tile pointer circuit and converted to absolute coordinates
 2018-04-01 08:19:52 -05:00
vuonojenmustaturska
7e639116f6 Merge pull request #36857 from iskyp/ayytableframes 
you can now walk through abductor table frames
 2018-04-01 07:33:14 -05:00
LetterJay
70264c238b icon state fix 2018-04-01 06:18:26 -05:00
LetterJay
88f328651f Update food_reagents.dm 2018-04-01 04:39:21 -05:00
LetterJay
610a001ad5 Update computer_ui.dm 2018-04-01 04:37:57 -05:00
Poojawa
75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05:00
LetterJay
17e92ca86b Merge pull request #6152 from Citadel-Station-13/upstream-merge-36734 
[MIRROR] Colossus projectile runtime removal
 2018-04-01 01:03:46 -05:00
LetterJay
24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147 
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
 2018-04-01 01:01:55 -05:00
LetterJay
cccab00fed Merge pull request #6134 from Citadel-Station-13/upstream-merge-36230 
[MIRROR] Pipenet fix
 2018-04-01 01:01:42 -05:00
LetterJay
81815605e2 Merge pull request #6213 from Citadel-Station-13/upstream-merge-36840 
[MIRROR] Fixes singularity power output
 2018-04-01 01:00:07 -05:00
Jordan Brown
d27541d5fb Merge pull request #36840 from 81Denton/singulo-power 
Fixes singularity power output
 2018-04-01 00:18:37 -05:00
Jordan Brown
7c6845b750 Merge pull request #36824 from Robustin/mblood 
Monkeys can now die of bloodloss
 2018-04-01 00:17:25 -05:00
Jordan Brown
c47a034069 Merge pull request #36834 from KorPhaeron/darkness2 
Removes advanced darkness
 2018-04-01 00:08:53 -05:00
LetterJay
c670eaa613 Merge pull request #6202 from Citadel-Station-13/upstream-merge-36836 
[MIRROR] Removes empty New()
 2018-03-31 19:03:55 -05:00
LetterJay
ecc453a823 Merge pull request #6200 from Citadel-Station-13/upstream-merge-36826 
[MIRROR] fixes a drinking glass smash runtime
 2018-03-31 19:03:44 -05:00
LetterJay
212e82dece Merge pull request #6199 from Citadel-Station-13/upstream-merge-36783 
[MIRROR] Being buckled to an object means space wind wont pull you
 2018-03-31 19:03:31 -05:00
LetterJay
38a1a0fca7 Merge pull request #6198 from Citadel-Station-13/upstream-merge-36804 
[MIRROR] Fixes silicons being unable to remotely use chemmaster functions
 2018-03-31 19:03:13 -05:00
LetterJay
9b913a462b Merge pull request #6197 from Citadel-Station-13/upstream-merge-36796 
[MIRROR] Make the delete verb check for SPAWN|DEBUG
 2018-03-31 18:44:41 -05:00
LetterJay
dfc437a00f Merge pull request #6196 from Citadel-Station-13/upstream-merge-36805 
[MIRROR] Cleans up duplicate chem_master power_change() proc
 2018-03-31 18:44:25 -05:00
LetterJay
df8f936cf8 Merge pull request #6195 from Citadel-Station-13/upstream-merge-36803 
[MIRROR] [s] Fixes chem dispenser not actually requiring power
 2018-03-31 18:44:11 -05:00
LetterJay
d5f94e6ce6 Merge pull request #6194 from Citadel-Station-13/upstream-merge-36794 
[MIRROR] Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message
 2018-03-31 18:43:53 -05:00
LetterJay
1ff35776a7 Merge pull request #6192 from Citadel-Station-13/upstream-merge-36795 
[MIRROR] Fixes custom ticker logic (#36792)
 2018-03-31 18:43:06 -05:00
LetterJay
19df345067 Merge pull request #6191 from Citadel-Station-13/upstream-merge-36787 
[MIRROR] Removed health cost for Twisted Construction upon casting on a wrong object
 2018-03-31 18:42:51 -05:00
LetterJay
54feba8901 Merge pull request #6190 from Citadel-Station-13/upstream-merge-36780 
[MIRROR] Fixes OOC ban not applying to admins
 2018-03-31 18:42:31 -05:00