Commit Graph

17602 Commits

Author SHA1 Message Date
DZD
5ce49bb3b3 Machine Upgrade Update
- Partial port of tgstation/-tg-station#9813
2015-08-20 21:03:19 -04:00
TheDZD
639478ace5 Merge pull request #1777 from Markolie/malf
Malf AI update
2015-08-20 11:50:19 -04:00
TheDZD
0c31d41e78 Merge pull request #1792 from Markolie/nano
NanoUI pod tracker/exosuit console, uplink fix
2015-08-20 11:50:14 -04:00
Mark van Alphen
9e80598119 Merge pull request #1805 from TheDZD/shadowling-fix
Shadowling Dethrall Fix
2015-08-20 17:50:04 +02:00
DZD
5205f55085 Shadowling dethrall fix
Should fix thralls not getting their spells removed upon dethralling.
2015-08-20 11:42:09 -04:00
Markolie
1e5d0ef4c8 Fix compile 2015-08-20 17:31:49 +02:00
Markolie
87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
Markolie
286d2301f4 Replace disabling RCD's with exploding them 2015-08-20 01:29:23 +02:00
Fox-McCloud
f89af99858 Merge pull request #1790 from Markolie/hosgun
Rename the head of security's energy gun
2015-08-19 17:05:17 -04:00
Fox-McCloud
f635d9c054 Merge pull request #1778 from Markolie/events
Revenant update, event weight tweaks
2015-08-19 17:04:14 -04:00
Markolie
4d21896e98 Fix cargo computer invalid request bug 2015-08-19 22:32:52 +02:00
Markolie
b6a1e52e08 Hopefully fix uplink crashing 2015-08-19 22:22:51 +02:00
Markolie
2b5f86e062 Single apostrophe instead of double 2015-08-19 22:06:55 +02:00
Markolie
9bab32fec4 Better escape solution 2015-08-19 21:58:56 +02:00
Mark van Alphen
b5afe7c459 Merge pull request #1787 from Spacemanspark/master
Griffin/ Owl toys actually make Griffin/ Owl noises.
2015-08-19 18:01:35 +02:00
TheDZD
2248b3eaa6 Merge pull request #1760 from Markolie/ipcmasterrace
IPC overhaul
2015-08-19 11:57:04 -04:00
Spacemanspark
5bdfbee22b Halves the sound of the owl and griffin toys.
Oh you no rike grorious sounds? Ding dong bannu!
2015-08-18 19:45:12 -05:00
Markolie
23071b5806 NanoUI AI fixer 2015-08-19 02:24:42 +02:00
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus
Admin teleport update, further admin message fixes
2015-08-18 20:19:55 -04:00
Fox-McCloud
43359d791d Merge pull request #1782 from Markolie/coffee
Coffee jitter fix, changeling revive fix
2015-08-18 20:19:11 -04:00
Fox-McCloud
5be7884143 Merge pull request #1774 from Markolie/tcomms2
AI tracking update
2015-08-18 20:18:04 -04:00
Markolie
4b3b9f57b0 Remove NO_POISON from golem/shadow 2015-08-19 01:30:35 +02:00
Markolie
6e036916ce Exosuit console NanoUI 2015-08-19 01:25:32 +02:00
Fox-McCloud
60b91936a6 Merge pull request #1791 from Markolie/disposal
Disposal trash bag fix
2015-08-18 18:15:54 -04:00
Markolie
b8b6d89225 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into nano 2015-08-18 23:38:03 +02:00
Markolie
f64eb59379 Janiborg disposal trash bag fix 2015-08-18 23:26:43 +02:00
Markolie
dc442a8814 Pod tracking console NanoUI 2015-08-18 23:25:15 +02:00
Markolie
16b8d91a08 rename computer frame 2015-08-18 22:00:27 +02:00
Markolie
473dcbead5 Remove IPC toxin immunity for now 2015-08-18 21:54:58 +02:00
Markolie
3c66f779ef Rename the head of security's energy gun 2015-08-18 21:52:05 +02:00
Markolie
f553fb6825 Replace special role checks with isAntag checks 2015-08-18 21:18:21 +02:00
Markolie
6576c02a71 More revenant updates 2015-08-18 21:06:48 +02:00
Markolie
8fb062706b If check fix 2015-08-18 21:00:11 +02:00
Markolie
bbc249172c Fix see_override, add uses to lockdown 2015-08-18 20:56:21 +02:00
Markolie
8086d61042 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into malf
Conflicts:
	code/game/objects/items/devices/aicard.dm
2015-08-18 20:24:10 +02:00
Markolie
80360fd8a9 Malf AI update 2015-08-18 20:22:38 +02:00
Markolie
c13d540aea Add xeno hide to xeno treasure cave 2015-08-18 18:41:07 +02:00
Markolie
8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Markolie
c10b62959b Re-add IPC syringing 2015-08-18 18:36:05 +02:00
Markolie
a41f15d17a Coffee fix, changeling revive fix 2015-08-18 18:33:58 +02:00
Markolie
a8f8fb160a Revenant update 2015-08-18 18:29:45 +02:00
Markolie
6bb7372ace Logging/ghost messages for various whispers 2015-08-18 18:15:49 +02:00
Spacemanspark
e0e3681e75 Griffin/ Owl toys actually make Griffin/ Owl noises. 2015-08-18 11:05:20 -05:00
Krausus
f816b8672d Resolves merge conflicts
Conflicts:
	code/game/machinery/computer/communications.dm
2015-08-18 04:14:14 -04:00
Krausus
6dc8b850ac Removes "Guests not allowed" admin message
Informing in-game admins that a guest failed to connect is completely
useless.
2015-08-18 03:50:33 -04:00
Krausus
a1cc629f6e Gives constructs universal_speak
This allows them to actually communicate with humans, rather than just
causing runtimes.
2015-08-18 03:38:47 -04:00
Krausus
7f75fe794e Fixes heads not being able to call the shuttle
Also fixes the inaccurate messages when attempting to call a shuttle too
early.
2015-08-18 03:33:29 -04:00
Krausus
2090a66023 Fixes various runtimes
- Fixes flashers runtiming when flashing someone who lacks eyes.
- Fixes chem masters runtiming when told to make 0 pills.
- Fixes job objective completion runtiming when someone without a PDA
completes a job objective.
- Fixes the HUDs of clientless robots runtiming when trying to update.
- Fixes T-ray scanners causing runtimes when objects they're making
visible get deleted.
- Fixes mech bay recharge station turfs runtiming if destroyed while
missing a recharging port/console.
2015-08-18 02:53:23 -04:00
Krausus
621341317d Fixes AI power supplies runtiming after deletion 2015-08-18 01:43:45 -04:00
Krausus
c3ec8d63f8 Fixes AI late-joins not deleting the inactive core 2015-08-18 01:34:15 -04:00