Commit Graph

13438 Commits

Author SHA1 Message Date
Spacemanspark 8d691a2944 Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)
Tully is a nerd.
2015-08-20 16:17:38 -05:00
Markolie fa55bc85f8 Baystation --> This server 2015-08-20 22:37:41 +02:00
Markolie eb2d2b6df9 Another dsay fix 2015-08-20 21:13:17 +02:00
Markolie d556608225 dsay fix 2015-08-20 20:58:54 +02:00
Markolie 4a0e02c4a8 Update start of game logging 2015-08-20 19:54:13 +02:00
Markolie 93e320c648 Add mob sprites to ERT backpacks 2015-08-20 19:33:35 +02:00
TheDZD 639478ace5 Merge pull request #1777 from Markolie/malf
Malf AI update
2015-08-20 11:50:19 -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
DZD f3970fb304 Wizard touch attacks and fixes
- Flesh to Stone and Disintegrate are now actual touch attacks.
- Fixes issue with in-hands and back sprites missing for the staff of
animation.
- Fixes missing right-handed in-hand for the staff of healing.
2015-08-20 10:21:45 -04:00
Fox-McCloud d623c97741 Detective Scanner Protolathe Production 2015-08-19 18:16:52 -04: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
TheDZD 2248b3eaa6 Merge pull request #1760 from Markolie/ipcmasterrace
IPC overhaul
2015-08-19 11:57:04 -04: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
Fox-McCloud 60b91936a6 Merge pull request #1791 from Markolie/disposal
Disposal trash bag fix
2015-08-18 18:15:54 -04:00
Markolie f64eb59379 Janiborg disposal trash bag fix 2015-08-18 23:26:43 +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 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 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
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 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
Krausus 59c4e30b05 Fixes delivery chutes losing their gas datums 2015-08-18 00:14:04 -04:00
Krausus 66083d6d6a Fixes timer assembly countdown rate
Now counts down 2 per (2-second) tick instead of 1, with a minimum of 6
instead of 5 (5 being identical to 6 with the new rate).
2015-08-18 00:00:53 -04:00
Fox-McCloud e618f79418 Merge pull request #1768 from Markolie/diona
Turn diona nymphs into simple animals
2015-08-17 21:34:46 -04:00
Markolie 4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Fox-McCloud 333e7fe236 Merge pull request #1766 from Markolie/adminbus
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Fox-McCloud 6d9e64b42b Merge pull request #1775 from Markolie/cult
Cult loyalty implant fix, other fixes
2015-08-17 17:12:46 -04:00
Fox-McCloud bef92affd7 Merge pull request #1758 from Markolie/spawnpanel
Spawn panel improvements
2015-08-17 16:43:16 -04:00
Markolie a15097f6fb Revenant update, event weight tweaks 2015-08-17 22:08:25 +02:00
Aurorablade a47a383ab8 Merge remote-tracking branch 'ParadiseSS13/master' into ImportentpAIUpdate 2015-08-17 16:07:22 -04:00
Markolie c91e698e24 Fix shuttle call sanitization 2015-08-17 21:20:00 +02:00
Markolie 487b73049f Sanity check 2015-08-17 21:08:55 +02:00
Markolie c688fd1c52 Add resting animations for syndifox, syndicat, cats and dionas 2015-08-17 21:07:19 +02:00