Commit Graph

8176 Commits

Author SHA1 Message Date
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
Jordan Brown
c48b35a0b2 Merge pull request #36787 from Davidj361/36744-twistedHealthFix
Removed health cost for Twisted Construction upon casting on a wrong object
2018-03-31 06:16:50 -05:00
LetterJay
694f3a6949 Merge pull request #6149 from Citadel-Station-13/upstream-merge-36636
[MIRROR] Fixes prosthetic limbs injury messages
2018-03-31 06:16:48 -05:00
Jordan Brown
9b53b3da2c Merge pull request #36780 from KorPhaeron/oocban
Fixes OOC ban not applying to admins
2018-03-31 06:16:41 -05:00
Jordan Brown
73d4e9b11c Fixes chem dispenser icon desync 2018-03-31 06:16:29 -05:00
Robustin
df9894ff4b Fixes monkey retaliation from beyond the grave 2018-03-31 06:16:18 -05:00
kevinz000
65097bb4e4 runtime 2018-03-31 06:16:05 -05:00
KorPhaeron
d6083b0ff6 Fixes staff of change borgs recieving AI laws (#36785)
* Fixes staff of change borgs recieving AI laws

* lawupdate
2018-03-31 06:15:50 -05:00
LetterJay
e6345d05bc Merge pull request #6146 from Citadel-Station-13/upstream-merge-36736
[MIRROR] Assemblies with lighting circuits now properly update light position.
2018-03-31 06:15:34 -05:00
ShizCalev
1c76539a5b Fixes mutant bodypart assignments 2018-03-31 06:15:24 -05:00
LetterJay
437301bf21 Merge pull request #6144 from Citadel-Station-13/upstream-merge-36609
[MIRROR] Night vision goggles no longer cancel out thermal eyes
2018-03-31 06:15:19 -05:00
Davidj361
2b280caa9b Fixed table crafting with tools in surrounding area (#36786) 2018-03-31 06:15:08 -05:00
LetterJay
acc54fedb0 Merge pull request #6142 from Citadel-Station-13/upstream-merge-36667
[MIRROR] Gas react is much more efficient
2018-03-31 06:15:05 -05:00
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
LetterJay
0c076ef013 Merge pull request #6137 from Citadel-Station-13/upstream-merge-36700
[MIRROR] Makes chem dispenser recharging far less glacial
2018-03-31 06:13:35 -05:00
Robustin
b26868a6b7 Get_Flat_Human_Icon no longer draws asses that nobody wants (#36781)
* Argument to limit excess icon work

* 50% less icon for your icon

* 75% less icon for your icon

* Correction

* statics the list, tweaks a default arg

* Cardinal argument list

* correct GLOB name
2018-03-31 06:13:28 -05:00
LetterJay
2e552042c5 Merge pull request #6136 from Citadel-Station-13/upstream-merge-36752
[MIRROR] Adds an admin follow link to revenant spawns
2018-03-31 06:13:22 -05:00
LetterJay
3db8277ccd Merge pull request #6135 from Citadel-Station-13/upstream-merge-36426
[MIRROR] Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety
2018-03-31 06:13:10 -05:00
LetterJay
cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJay
002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
kevinz000
dc4b52bcfd logging (#36818) 2018-03-29 18:31:31 -07:00