Commit Graph

5686 Commits

Author SHA1 Message Date
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
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
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
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
LetterJay e3eda7c49a Merge pull request #6189 from Citadel-Station-13/upstream-merge-36770
[MIRROR] Fixes chem dispenser icon desync
2018-03-31 18:42:09 -05:00
LetterJay 29bd14c0c2 Merge pull request #6187 from Citadel-Station-13/upstream-merge-36827
[MIRROR] Fixes flightsuit active gib runtime
2018-03-31 18:41:55 -05:00
LetterJay 043f05e466 Merge pull request #6186 from Citadel-Station-13/upstream-merge-36785
[MIRROR] Fixes staff of change borgs recieving AI laws
2018-03-31 18:41:24 -05:00
LetterJay 8dfefe3037 Merge pull request #6184 from Citadel-Station-13/upstream-merge-36786
[MIRROR] Fixed table crafting with tools in surrounding area
2018-03-31 18:41:08 -05:00
LetterJay fa64b72ea6 Merge pull request #6180 from Citadel-Station-13/upstream-merge-36781
[MIRROR] Get_Flat_Human_Icon no longer draws asses that nobody wants
2018-03-31 18:39:15 -05:00
kevinz000 5a6a8c332a Buildmode GC (#36828) 2018-03-31 14:02:54 -07:00
Jordan Brown d47686c88e Removes empty New() 2018-03-31 09:11:04 -05:00
kevinz000 c932f3ae52 fixes a drinking glass smash runtime (#36826)
* smash runtime

* qdeling
2018-03-31 07:11:44 -05:00
LetterJay 05e85ddfb0 Merge pull request #6168 from Citadel-Station-13/upstream-merge-36625
[MIRROR] Fixes blueprints exploit
2018-03-31 06:21:14 -05:00
LetterJay c3ddcb9da7 Merge pull request #6162 from Citadel-Station-13/upstream-merge-36628
[MIRROR] Fixes "ocular wardens don't target buckled mobs"
2018-03-31 06:20:12 -05:00
LetterJay 48bfd57b0f Merge pull request #6161 from Citadel-Station-13/upstream-merge-36714
[MIRROR] Fixes strobe shields' icon getting stuck
2018-03-31 06:19:55 -05:00
LetterJay 2d4218d6c6 Merge pull request #6159 from Citadel-Station-13/upstream-merge-36610
[MIRROR] Little fix to RPED
2018-03-31 06:19:19 -05:00
LetterJay a40df26aed Merge pull request #6158 from Citadel-Station-13/upstream-merge-36765
[MIRROR] Fixes the cargo Express Console's description [wtf why is there a sprites tag]
2018-03-31 06:19:05 -05:00
KorPhaeron 7f44453232 Being buckled to an object means space wind wont pull you (#36783)
* Being buckled to an object means space wind wont pull you

* Puts check in the proper place
2018-03-31 06:18:29 -05:00
ShizCalev d29eb299ec Fixes silicons unable to remotely use chemmaster 2018-03-31 06:18:13 -05:00
LetterJay 018fa05f01 Merge pull request #6155 from Citadel-Station-13/upstream-merge-36554
[MIRROR] Adds config to allow ranks only from txt
2018-03-31 06:17:58 -05:00
Jordan Brown c97d4e0970 Merge pull request #36796 from neersighted/delete_perms
Make the delete verb check for SPAWN|DEBUG
2018-03-31 06:17:58 -05:00
Jordan Brown ca7f0796a2 Merge pull request #36805 from ShizCalev/chemmaster-power-change-cleanup
Cleans up duplicate chem_master power_change() proc
2018-03-31 06:17:44 -05:00
Jordan Brown 0273ee6d03 Merge pull request #36803 from ShizCalev/chem-dispenser-exploit-fix
[s] Fixes chem dispenser not actually requiring power
2018-03-31 06:17:34 -05:00
kevinz000 6e64e8e601 Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message (#36794)
* job availability

* avail

* Boop
2018-03-31 06:17:20 -05:00
LetterJay 9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617
[MIRROR] Improves some logging legibility
2018-03-31 06:17:11 -05:00
Jordan Brown 447008e625 Merge pull request #36795 from robbym/master
Fixes custom ticker logic (#36792)
2018-03-31 06:17:00 -05:00