Commit Graph

12503 Commits

Author SHA1 Message Date
Incoming5643
3bcf8564ef game mode code strikes again 2015-12-16 00:49:47 -05:00
Incoming
ae5f8bb1db Fixes up the syndicate telecrystal bonus counting things like roundstart ghosts, new_players, and the nuke ops themselves in their threat assessment. Technically a nerf. 2015-12-16 00:38:24 -05:00
Cheridan
ff2bc4d022 Merge pull request #13529 from KorPhaeron/tele_ops
Ops can't fly to abandoned satellite or derelict
2015-12-13 20:58:40 -06:00
Cheridan
1019b057c5 Merge pull request #13557 from bgobandit/nanomedfix
Wall-mounted nanomeds no longer have more contents than the Nanomed Plus.
2015-12-13 00:04:25 -06:00
Cheridan
6a9a5c820e Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up
Supermatter swords and the infinite void
2015-12-12 23:22:48 -06:00
duncathan salt
e97f647158 Merge pull request #13499 from AnturK/turretfix
Fixes syndicate turrets shooting after breaking
2015-12-12 14:54:19 -06:00
Cheridan
5dcc208ee2 Merge pull request #13569 from KorPhaeron/low_layer
Fixes girders being on a low layer
2015-12-12 13:01:32 -06:00
Cheridan
45c06ae2cd Merge pull request #13555 from bgobandit/sexyhonk
Buffs the sexy clown.
2015-12-12 13:00:46 -06:00
Cheridan
99e7506731 Merge pull request #13572 from KorPhaeron/creepy_crawly
Various Spider Fixes
2015-12-12 12:43:03 -06:00
duncathan salt
9716702fb6 Merge pull request #13537 from KorPhaeron/work_place_hazard
Standing between activating shield generators is now deadly
2015-12-11 18:29:54 -06:00
KorPhaeron
bce927ef72 Removes syndicate destinations 2015-12-11 18:17:26 -06:00
KorPhaeron
f5c35298c9 Visible message update 2015-12-11 18:03:38 -06:00
Cheridan
c641643c55 Merge pull request #13539 from KorPhaeron/dance_moves
Hitting someone with a dualsaber now has a chance to make you *flip
2015-12-11 17:27:42 -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
a251002d6f Merge pull request #13532 from Jalleo/pAI
Personal Artificial Intelligence Fix
2015-12-11 22:46:24 +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
53172fa9ce Merge pull request #13516 from Anonus/whymode
Fixes up blob code some
2015-12-11 18:14:56 +00: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
Cheridan
41709c7016 Merge pull request #13546 from KorPhaeron/RADIATION_PULSE_DETECTED
Removes rad pulse admin notice
2015-12-11 07:14:15 -06:00
KorPhaeron
44873907f4 More spider fixes 2015-12-11 04:42:04 -06:00
KorPhaeron
0ece383776 Fixes girders on low layer 2015-12-11 02:29:46 -06: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
8ee40a1518 supermatter now reduces turf to base turf, and checks for base turf instead of space.
(in most settings, base turf IS space)
2015-12-10 19:46:35 -05:00
bgobandit
73471eb8b1 sexy clown is now a sexy object oriented clown 2015-12-10 19:19:03 -05:00
Incoming
a05e29b27e Supermatter swords can no longer consume space itself to spam radiation at people. 2015-12-10 17:13:40 -05:00
Cheridan
6b1160b644 Merge pull request #13528 from AnturK/Heartbeat
Fixes doppler arrays
2015-12-10 16:02:46 -06:00
bgobandit
7a0f486dd0 Wall-mounted nanomeds no longer have more/better contents than the Nanomed Plus found in medbay. 2015-12-10 16:19:56 -05:00
bgobandit
984582f6ba tweaks and shit 2015-12-10 15:48:22 -05:00
bgobandit
92d86dd369 Adds mats/origintech/burn_state to more items. 2015-12-10 15:32:28 -05: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
blah
844b10fa33 Whoops I left a debug 2015-12-10 14:42:43 +00:00
blah
acf95ccfd9 Fixes the pAI and removes the .gitignore issue that I caused from other stuff 2015-12-10 14:40:04 +00:00
KorPhaeron
1bcd8e57f2 Removes rad pulse admin notice 2015-12-10 04:26:56 -06:00
KorPhaeron
c6884c529b Gib 2015-12-09 21:55:58 -06:00
KorPhaeron
50e4e77250 Fixes UI stuff 2015-12-09 21:37:18 -06:00
Cheridan
e619b8fb55 Merge pull request #13512 from AnturK/mulebutts
Bot and general pathing fixes
2015-12-09 20:03:41 -06:00
KorPhaeron
56ecfaff68 Flip 2015-12-09 19:59:12 -06:00
KorPhaeron
1762c2ad8b Deadly shield generators 2015-12-09 19:46:06 -06:00
blah
5fff63d62c Changes pAI to have hearable_message() rather than visible_message() as that doesn’t work from inside objects 2015-12-09 20:04:54 +00:00
AnturK
6d63d5e234 Fixes doppler arrays 2015-12-09 20:06:14 +01:00
Cheridan
3c98d1f8cf Merge pull request #13505 from Incoming5643/hud_buds
Fixes a few team hud issues
2015-12-09 10:20:26 -06:00
Nerd Lord
41fde5757f Fixes up blob code some;
any blob can block atmos, the core and nodes now do so
blobs use two different procs for checking health and updating icons instead of one(there's probably a use for this)
the split consciousness verb now requires a node under your selector, instead of checking a global list of nodes and picking the newest(why?)
blobs can no longer take non-brute and burn damage types(I would make toxin do bonus damage but the crew can't apply it anyway)
2015-12-08 23:58:05 -05:00
Cheridan
da3eba756d Merge pull request #13463 from Incoming5643/a_placebo_effect
Adds glowcaps
2015-12-08 22:08:25 -06:00
duncathan salt
90f6e491c1 Merge pull request #13501 from Anonus/darkblob
Makes blobs emit less light
2015-12-08 21:27:14 -06: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
duncathan salt
4d3bee9933 Merge pull request #13494 from tkdrg/Howdid-this_evenBreak
Fixes AI camera reactivation
2015-12-08 11:53:06 -06:00
duncathan salt
43358ba5d4 Merge pull request #13489 from ktccd/BlobwinFix
Fixes the blob win condition
2015-12-08 11:52:10 -06:00
duncathan salt
09cb5b732e Merge pull request #13484 from MrStonedOne/patch-82
Makes noslip floors speed movement up.
2015-12-08 11:51:41 -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