Commit Graph

14906 Commits

Author SHA1 Message Date
Fox McCloud
b993295e60 Merge pull request #6120 from TullyBurnalot/OverOverload
Multiple Ascendant Light Fix
2017-01-15 12:44:47 -05:00
TullyBurnalot
f7b729c138 ACTUALLY addresses suggestion by Krausus 2017-01-15 17:37:30 +00:00
Fox McCloud
011b492e2e Merge pull request #6146 from Crazylemon64/i_love_evil_traps
Makes Adminbussing Evil Traps Easier
2017-01-15 12:06:39 -05:00
TullyBurnalot
86536e3b43 Removes needless proc 2017-01-15 14:35:00 +00:00
TullyBurnalot
d2210f24c5 Re-adds skip_sounds_and_sparks
Woops, forgot how useful this could be
2017-01-15 14:25:05 +00:00
TullyBurnalot
2d82f940f6 Addresses suggestion by Krausus/Syntax fix 2017-01-15 14:20:15 +00:00
Krausus
3aa007a1c7 Pet slime tweaks 2017-01-14 17:38:08 -05:00
Crazylemon64
0e01cf9353 Redundancy removal 2017-01-13 15:33:22 -08:00
Crazylemon64
d2da018f56 Removes the /atom-level var 2017-01-13 14:05:04 -08:00
Fox McCloud
2aa86d8777 Merge pull request #5704 from uraniummeltdown/lingfixesspecies
Changeling Changes
2017-01-13 15:50:17 -05:00
Fox McCloud
5df12c667a Merge pull request #6151 from DarkPyrolord/nojoyallowed
Removes the joy mask
2017-01-13 12:39:42 -05:00
Aurorablade
5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie 2017-01-11 23:41:06 -05:00
DarkPyrolord
217244deac Removes the joy mask 2017-01-12 16:19:12 +13:00
Fox McCloud
b75614c4a2 Merge pull request #6138 from Puckaboo2/masterbackup
Adding medical scrubs and caps to the loadout
2017-01-11 16:36:44 -05:00
Fox McCloud
42545b0583 Merge pull request #6133 from Crazylemon64/fix_custom_open_borgpanels
Custom borg panels no longer overwrite themselves
2017-01-11 08:53:31 -05:00
Fox McCloud
dce9edc6e3 Merge pull request #6129 from Crazylemon64/ghost_clearcut_respawnability
Ghosts now have an indicator on whether they can respawn or not
2017-01-11 08:52:37 -05:00
Fox McCloud
ca71f03f7e Merge pull request #6135 from FlattestGuitar/fluff-comp
Adds a fluff item for ComputerlessCitizen
2017-01-11 08:51:11 -05:00
Fox McCloud
68dfbf6217 Merge pull request #6131 from Crazylemon64/robot_module_actions
Robot module actions
2017-01-11 08:50:50 -05:00
Fox McCloud
cd82e3d48f Merge pull request #6143 from uraniummeltdown/engiboardsfix
Atmos Consoles Fix
2017-01-11 08:48:04 -05:00
Fox McCloud
44401d384d Merge pull request #6144 from Crazylemon64/runtime_killer
Runtime killer
2017-01-11 08:47:34 -05:00
Crazylemon64
3c50c2f6ba Makes conveyors easier to place with buildmode, adds vars to autogibbers
makes them kill stuff stupid fast
2017-01-11 02:07:20 -08:00
Crazylemon64
3e141ebbb7 Mining drones now are able to use meson sight again
Mining drones now can activate mesons
2017-01-10 23:37:49 -08:00
uraniummeltdown
c4033a85bd added category for atmos consoles 2017-01-11 09:56:16 +04:00
Crazylemon64
bfdd22dcd9 Fixes a few limb removal runtimes 2017-01-10 18:59:33 -08:00
Fox-McCloud
8e355a867c Fixing Food Runtime 2017-01-10 21:40:54 -05:00
Fox McCloud
ef3e433f07 Merge pull request #6125 from Crazylemon64/spiders_non_xeno
Giant Spiders no longer clog up the Alien role channel
2017-01-10 17:46:43 -05:00
FlattestGuitar
0cc4080288 Merge branch 'master' into fluff-comp 2017-01-10 21:46:20 +01:00
Puckaboo2
69ac2be044 Adding medical scrubs and caps to the loadout 2017-01-10 13:30:13 -07:00
Crazy Lemon
f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework
Food rework
2017-01-10 12:11:17 -08:00
Crazy Lemon
09c0e6d646 Merge pull request #6136 from FlattestGuitar/logfix
Fixes a silly admin logs runtime
2017-01-10 12:08:26 -08:00
Fox McCloud
c8548edf07 Merge pull request #6087 from uraniummeltdown/autodrobe
Adds more costumes to Autodrobe
2017-01-10 14:36:00 -05:00
FlattestGuitar
81b723577e Fixes a silly admin logs runtime 2017-01-10 19:45:46 +01:00
uraniummeltdown
7667112d6f changed lingprotect flag to notranssting, no injecting vox or plasmaman dna, plasmamen can be ling and affected by powers 2017-01-10 22:13:19 +04:00
uraniummeltdown
ed3016abe6 updated flags 2017-01-10 20:43:55 +04:00
FlattestGuitar
f610be5fb1 Adds a fluff item for ComputerlessCitizen 2017-01-10 14:31:27 +01:00
Fox McCloud
cfc5c0a10b Merge pull request #6114 from uraniummeltdown/mimename
Mimes can rename themselves
2017-01-10 04:02:21 -05:00
Crazylemon64
36b967c93b Fully rips out cyborg sight modules 2017-01-10 00:32:11 -08:00
Crazy Lemon
3961aa3bcd Merge pull request #6074 from TullyBurnalot/Splatterdash
Wand of Death Reliable Killing
2017-01-10 00:27:23 -08:00
Crazylemon64
53977e2729 Ayyyyyy 2017-01-10 00:18:46 -08:00
Crazylemon64
3408f63f6d Borgs now have vision actions instead of items to toggle vision modes 2017-01-10 00:18:46 -08:00
Crazylemon64
01450122b2 Adds preliminary robot module sight actions
No icons yet, that's another commit
2017-01-10 00:18:46 -08:00
Crazylemon64
ca9142bce0 Custom borg panels no longer overwrite themselves 2017-01-10 00:16:24 -08:00
Fox McCloud
5770602a82 Merge pull request #6117 from TullyBurnalot/BorgScannu
pAI HUD Tweak
2017-01-10 03:16:04 -05:00
Fox McCloud
7c72bfb548 Merge pull request #6130 from Crazylemon64/always_the_most_obvious
Borg sight modules work again
2017-01-10 03:12:57 -05:00
Fox McCloud
6336de2265 Merge pull request #6128 from Crazylemon64/pai_resting_fix
Fixes a few pAI bugs
2017-01-10 03:01:49 -05:00
Crazy Lemon
7b20b6a36b Merge pull request #6119 from FlattestGuitar/fluff-ryby
Adds a fluff item for Duckchan
2017-01-09 20:27:48 -08:00
Crazylemon64
238e7c4f42 Borg sight modules work again 2017-01-09 19:45:31 -08:00
Crazylemon64
bf24bc9b10 pAIs are no longer evicted from their bodies at death 2017-01-09 19:27:04 -08:00
Crazylemon64
baa721b68f Ghosts now have an indicator on whether they can respawn or not 2017-01-09 19:24:08 -08:00
Crazylemon64
c5b54e8bd1 pAIs (and other wrapped player mobs) can now hear whispers on adjacent
tiles
2017-01-09 19:09:44 -08:00