Commit Graph

12467 Commits

Author SHA1 Message Date
Jordie0608 9705746625 adds nt's sprite for syndielite suit 2015-11-30 15:43:47 +11:00
duncathan salt ad410e39d8 Merge pull request #13296 from neersighted/nanoui_checks
Fix some NanoUI checks
2015-11-29 18:36:18 -06:00
KorPhaeron 0f2eee4e17 Cleans up meatgrinder code 2015-11-29 18:30:34 -06:00
Cheridan 3f231755cf Merge pull request #13295 from KorPhaeron/wj_hates_fun
Removes simple xenomorphs from gold slime cores
2015-11-29 18:07:09 -06:00
Vincent 05ae680b06 Fixing conflicts:
code/game/machinery/computer/computer.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
duncathan salt 77b841fe9b Merge pull request #13305 from KorPhaeron/hardhat
Removes relative pathing in hardhat.dm
2015-11-29 17:30:27 -06:00
Cheridan 126e2ce5e3 Merge pull request #13289 from phil235/HostileAnimalProjectileFix
Hostile Animal Projectile Fix
2015-11-29 17:25:24 -06:00
Bjorn Neergaard 06e5df9336 Fix NanoUI missing assignment; use two-line ifs 2015-11-29 18:20:10 -05:00
Bjorn Neergaard df02a33f3d Remove redundant NanoUI checks 2015-11-29 17:49:29 -05:00
Bjorn Neergaard 8ba095a931 Fix a typo 2015-11-29 16:56:22 -05:00
duncathan salt 6fca11d85f Merge pull request #13292 from neersighted/nanoui_update
Fix Chemistry NanoUIs
2015-11-29 15:42:28 -06:00
GunHog 97568959a5 Xenomorph Royals are now immune to injection.
Royal Xenomorphs (Praetorian, Queen) can no longer be injected by
syringes or syringe guns.
2015-11-29 15:25:26 -06:00
YotaXP 3c005616d5 Make swarmers drop ARTIFICIAL bluespace crystals. 2015-11-29 16:18:42 -05:00
Tkdrg 4da263dead Fixes jobban_isbanned() runtime
Fixes runtime with ckey-less mobs.
2015-11-29 17:31:19 -03:00
swankcookie 808adcfa9d Merge branch 'master' of https://github.com/tgstation/-tg-station into Cloak_fix
# Conflicts:
#	icons/mob/suit.dmi
2015-11-29 13:38:16 -06:00
Remie Richards edfb957bd2 Merge pull request #13088 from as334/master
Plasmamen fixes
2015-11-29 19:17:11 +00:00
as334 0048a5b2a7 Fuck this, fuck you 2015-11-29 14:10:46 -05:00
swankcookie 53d66e698c unneeded addition, i guess 2015-11-29 12:58:46 -06:00
as334 dc98e67f05 Just fuck my shit up fam 2015-11-29 13:48:58 -05:00
duncathan salt a9cfc6eb8a Merge pull request #13288 from AnturK/topicfix
Fixes AI canUseTopic
2015-11-29 12:35:03 -06:00
duncathan salt f7eae879d2 Merge pull request #13004 from Shadowlight213/mobbuffs
buffs syndicate simple mobs
2015-11-29 12:33:09 -06:00
duncathan salt 9e9ccf9474 Merge pull request #13268 from Anonus/teachingsofnarsie
Cult theme update
2015-11-29 12:23:07 -06:00
Nerd Lord fba1c1129a fine, fine fuck okay sure
don't sacrifice dogs, okay? nar-sie has standards, of a sort
2015-11-29 13:11:18 -05:00
MMMiracles f67dde21d5 foundation set, demands given. 2015-11-29 12:34:49 -05:00
Bjorn Neergaard f214e547cb NanoUI Airlock Electronics
Also reworks a lot of the AE code.
2015-11-29 11:32:56 -06:00
Kyle Spier-Swenson 59963b89b5 quant --> quaint 2015-11-29 08:00:33 -08:00
MrStonedOne 921c9eede1 Asset cache Fixes
Fixes asset cache locking up the MC initialization at world start.
Fixes asset cache not pre-loading resources to clients that connect from a world reboot.
Fixes a null reference runtime relating to the client disconnecting at the wrong time (I still conciser this to be a byond bug)
Fixes crew monitor registering assets because they exist
Fixes crew monitor trying to send zlevel assets for zlevels it hasn't processed.
Fixes nano ui sometimes not sending the template asset to the client on open.
2015-11-29 07:19:49 -08:00
kingofkosmos edb611f53d Adds in-hand sprites for tracking beacon, pizza box and carp plushie. 2015-11-29 16:43:52 +02:00
Jordie e9ea0d8dc9 Merge pull request #13275 from swankcookie/snowman
Adds Snowman costume
2015-11-29 21:08:11 +11:00
Jordie 3fce4f80be Merge pull request #13246 from KorPhaeron/stop_getting_shot_godamn
Allows you to forcibly recall your guardian/parasite
2015-11-29 21:07:29 +11:00
Jordie aa672d3e95 Merge pull request #13230 from JJRcop/i12317
Fixes changeling hivemind download
2015-11-29 21:07:18 +11:00
Jordie 56c2659736 Merge pull request #13187 from ktccd/master
Fixes areas blobs shouldn't win from spreading to.
2015-11-29 21:06:46 +11:00
Jordie 38eddb1421 Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
Jordie da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Jordie 7b1a92885c Merge pull request #13024 from TheNightingale/Nighting
Elite Syndicate Hardsuit
2015-11-29 21:05:36 +11:00
Shadowlight213 2247efb278 Adds armor penatration. 2015-11-29 01:59:22 -08:00
Razharas 8f79afd900 Merge pull request #13236 from MrStonedOne/patch-71
Makes False Alarm only choose events that actually have alarms
2015-11-29 12:04:21 +03:00
Razharas e0a14d899d Merge pull request #13267 from tkdrg/give_me_a_banjob_baby
Jobban cleanup & performance improvements
2015-11-29 12:00:01 +03:00
Razharas 2f0a221c8c Merge pull request #13276 from MrStonedOne/patch-74
Removes spawn(rand(10,150)) from client database syncing
2015-11-29 11:57:05 +03:00
swankcookie 225ce9e555 what do i look like? spellcheck? 2015-11-29 02:27:05 -06:00
swankcookie fe65e8a3b4 puts cloak in suit slot 2015-11-29 00:52:27 -06:00
swankcookie fe35576c63 changes round type in desc 2015-11-29 00:15:37 -06:00
as334 611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
KorPhaeron dfc025db36 Missed some lines 2015-11-28 23:14:38 -06:00
KorPhaeron 5ef5a57f73 removes relative pathing 2015-11-28 23:10:14 -06:00
Kyle Spier-Swenson 7ef8162640 Minor fuckup with deadchat (F) links breaking compiling 2015-11-28 19:50:39 -08:00
Kyle Spier-Swenson dbacbfd0f4 Gives deadchat the (f) follow link.
I realllllllllly want to make this use M.Hear() rather then a istype check but it has a lot of args i don't understand how to implement.

If you think it's worth it to fake a say call to Hear(), I'll take suggestions on how to implement that.

(remember: all mob types have a potential to hear dead chat, as admins can always hear it, so we'd have to take into account all mob's overrides to Hear())

Side note: fixes admins not hearing deadchat while in lobby when enabled.
2015-11-28 19:43:32 -08:00
Bjorn Neergaard f52cf6fd2a Improve Attack animations
Ported my own animations from Bay.

Also improved code for /atom/movable/do_attack_animation.
2015-11-28 21:29:24 -06:00
Cheridan 4a408a5cff Merge pull request #13237 from bgobandit/facehuggersfuck
Fixes facehugger-related bugs.
2015-11-28 21:08:37 -06:00
YotaXP fadcfa83bb Make swarmers drop bluespace crystals. 2015-11-28 22:01:59 -05:00