Commit Graph

12277 Commits

Author SHA1 Message Date
Cheridan 45c06ae2cd Merge pull request #13555 from bgobandit/sexyhonk
Buffs the sexy clown.
2015-12-12 13:00:46 -06:00
Cheridan 76ac529d1b Merge pull request #13568 from KorPhaeron/leap_fix
Hunter leap fix
2015-12-12 12:58:10 -06:00
Cheridan 99e7506731 Merge pull request #13572 from KorPhaeron/creepy_crawly
Various Spider Fixes
2015-12-12 12:43:03 -06:00
Cheridan 92dcb09fff Merge pull request #13565 from Incoming5643/my_curse_MY_CURSE
I fudged fudge dice
2015-12-12 12:40:46 -06:00
Cheridan 6fa38380ae Merge pull request #13503 from KorPhaeron/reactive
Fixes all clothing having a chance to block thrown items
2015-12-11 17:46:01 -06:00
Cheridan a5d6d832f8 Merge pull request #13553 from AnturK/cant_say_no_to_probing
Fixes Abductor event firing up multiple times
2015-12-11 17:18:46 -06:00
Cheridan 78093c0bf0 Merge pull request #13556 from bgobandit/matsagainfuckina
Adds mats/origin tech/burn_state to more items.
2015-12-11 17:13:42 -06:00
Razharas 7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
Razharas 850f8c6792 Merge pull request #13538 from Incoming5643/no_a_blob_didnt_spawn_stop_asking
Fixes false alarm picking late round exclusive events early
2015-12-11 22:48:12 +03:00
Razharas 5b5e48bad8 Merge pull request #13526 from Lo6a4evskiy/ninja-fixes
Fixes ninja suit not draining energy after running out of it once
2015-12-11 22:44:55 +03:00
Razharas 550d7779eb Merge pull request #13514 from tkdrg/dadadaDADADA
Fixes human canUseTopic() misbehaving
2015-12-11 22:43:36 +03:00
Razharas 83bb88868c Merge pull request #13153 from Jordie0608/arguablyallgunsareenergygunsandallbeamsareprojectiles
Unifies energy gun self charging
2015-12-11 22:38:07 +03:00
Remie Richards 0ae0f84325 Revert "[s]Fixes the logic of IsBanned and bad CIDs" 2015-12-11 17:49:30 +00:00
Remie Richards 1efcc64990 Fixes the logic of IsBanned and bad CIDs
the bad CIDs aren't perfectly the Integer max, they're above it.
2015-12-11 17:27:42 +00:00
Cheridan de914590fa Merge pull request #13544 from KorPhaeron/survival
Adds survival capsules to pod safes
2015-12-11 10:26:04 -06:00
Cheridan a002ca8917 Merge pull request #13542 from KorPhaeron/gigantic_epipens
Fixes small objects covering the entire tile after a fire
2015-12-11 07:23:00 -06:00
KorPhaeron 44873907f4 More spider fixes 2015-12-11 04:42:04 -06:00
KorPhaeron 6880b68269 Spiders in the dark 2015-12-11 04:33:57 -06:00
KorPhaeron 25a3010551 Leap fix 2015-12-11 00:58:52 -06:00
Jordie d7e7ef9280 Update energy.dm 2015-12-11 16:25:16 +11:00
Jordie0608 7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles
Conflicts:
	code/modules/projectiles/guns/energy/laser.dm
2015-12-11 15:59:46 +11:00
Incoming a5aa452c2b I fudged it 2015-12-10 22:22:22 -05:00
bgobandit 73471eb8b1 sexy clown is now a sexy object oriented clown 2015-12-10 19:19:03 -05:00
Cheridan 76f05602fa Merge pull request #13523 from KorPhaeron/stat_attack
Fixes syndicate mobs not attacking unconcious people
2015-12-10 15:42:03 -06:00
bgobandit 92d86dd369 Adds mats/origintech/burn_state to more items. 2015-12-10 15:32:28 -05:00
bgobandit 5f293c1d2b The sexy clown jumpsuit now reacts properly on hit. 2015-12-10 15:09:51 -05:00
AnturK a8ed812584 Fixes Abductor event firing up multiple times 2015-12-10 19:29:10 +01:00
Incoming 6a64864805 formally defines apprentices as a kind of antag instead of as "traitors".
Wizard events that spare the wizard should now properly spare apprentices too.

Moves renaming as an apprentice to the end of the spawn proc because the input prompt stops various important things (including the sound meant to inform people they got apprentice) from happening until after it's dealt with.

Restores the "+" for positive quality items in RPG loot. The reason this was changed was already fixed, it just was mistakenly never put back.
2015-12-10 12:08:49 -05:00
KorPhaeron 755455c9de New sprite 2015-12-10 01:36:27 -06:00
KorPhaeron 50e4e77250 Fixes UI stuff 2015-12-09 21:37:18 -06:00
Cheridan b0da7b3a64 Merge pull request #13496 from AnturK/spawnerfix
Fixes pre-round sleeper activation
2015-12-09 20:16:56 -06:00
Cheridan 5004bcdba2 Merge pull request #13122 from RemieRichards/Synths
Adds a Synth Species
2015-12-09 20:11:09 -06:00
Cheridan e619b8fb55 Merge pull request #13512 from AnturK/mulebutts
Bot and general pathing fixes
2015-12-09 20:03:41 -06:00
Incoming b376e15830 False alarm will no longer pick events that couldn't have actually happened at that point in the round 2015-12-09 20:52:23 -05:00
Lo6a4evskiy 174dccc78f Refactors ntick proc, fixes ninja suit not draining energy 2015-12-09 20:28:43 +04:00
KorPhaeron 68b9db27fd Fixes syndicates 2015-12-09 10:25:33 -06:00
Cheridan f29336a4f8 Merge pull request #13470 from AnturK/academytwo
Academy Fixes & Upgrades.
2015-12-08 22:25:05 -06:00
Cheridan da3eba756d Merge pull request #13463 from Incoming5643/a_placebo_effect
Adds glowcaps
2015-12-08 22:08:25 -06:00
Tkdrg 90abb82ba6 Fixes human canUseTopic() misbehaving
Now works properly when you're inside something.
Fixes #13233
2015-12-08 22:10:24 -03:00
AnturK bc87752245 Fixes unpowered doors being ignored by AStar
Fixes avoid turf functionality
Makes mulebots only recalculate paths due to blockades only once per life tick.
2015-12-08 23:56:21 +01:00
Incoming5643 40cac0aec3 Racism against division must end 2015-12-08 13:53:18 -05:00
duncathan salt 3ac8a3fc9a Merge pull request #13491 from GunHog/Gimme_ALL_The_HUDS!
Adds Diagnostic HUD to ghosts
2015-12-08 11:52:53 -06:00
duncathan salt 160d5428b8 Merge pull request #13474 from Shadowlight213/Aghost_control
Allows admins to interact with most machines like an AI [Review Ready]
2015-12-08 11:51:27 -06:00
duncathan salt 9cd7bdb0a0 Merge pull request #13462 from KorPhaeron/holes
Chasm/hole turfs
2015-12-08 11:47:05 -06:00
duncathan salt b3992868d5 Merge pull request #13326 from Jordie0608/doyouthinkthesyndicatehaveadedicatedfashiondesigner
Adds nt's sprite for syndielite suit
2015-12-08 11:44:24 -06:00
duncathan salt 3ea5409f4b Merge pull request #13320 from GunHog/Removes_Royal_Alien_Penetration
Xenomorph Royals are now immune to injection.
2015-12-08 11:43:43 -06:00
duncathan salt 15ae23b74f Merge pull request #13257 from Jordie0608/allthevarsthatdontgeteditedbecomeverylonely
Adds on_varedit proc
2015-12-08 11:43:14 -06:00
Jordie dee6b6a4c3 Merge pull request #13482 from MrStonedOne/patch-80
Fixes runtime in lighting system
2015-12-08 15:41:07 +11:00
KorPhaeron 5fed0f5106 Moves - 2015-12-07 21:44:35 -06:00
KorPhaeron 76c8f82d8c Blocking 2015-12-07 21:01:25 -06:00