Commit Graph

24890 Commits

Author SHA1 Message Date
Jordie0608 9705746625 adds nt's sprite for syndielite suit 2015-11-30 15:43:47 +11:00
Bjorn Neergaard dfb2f81b7f Apparently this check is redundant 2015-11-29 21:28:25 -05: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
Bjorn Neergaard 3c1614e62d Remove Cryo eject verb, revert sleeping/knockout removal, give resist a delay
Some shitler removed the sleeping effect
2015-11-29 19:05:04 -05: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
MMMiracles 4fb081826f shh 2015-11-29 15:55:26 -05:00
MMMiracles e6cfba70a2 iced variant of regular walls added 2015-11-29 15:45:22 -05:00
Razharas a2bcbf5db7 Merge pull request #13279 from tkdrg/PUTTING_YOUR_VARS_IN_A_POOL
Ports the /vg/ pooling resetVars by Clusterfack
2015-11-29 23:36:07 +03: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 a4151bb212 Merge pull request #13280 from Anonus/mmbuff
Fixes inflict_handler spells not doing burn damage in some cases
2015-11-29 12:36:18 -06:00
duncathan salt aa7df92150 Merge pull request #13282 from Anonus/fluxfix
Fixes flux and gravitational anomalies not shocking nondense mobs
2015-11-29 12:35:30 -06: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
MMMiracles d4d63b7d3f start of something 2015-11-29 11:02:38 -05: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
AnturK 024f635aa9 Fixes Teleport spell 2015-11-29 14:33:40 +01:00
Jordie fd96c313a7 Merge pull request #13248 from bgobandit/dominatorfix
Fixes dominator error message issue.
2015-11-29 21:08:38 +11: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 ce5d74ef07 Merge pull request #13221 from MrStonedOne/patch-69
Changes event fire rate from 5-15 minutes to 3-10 minutes
2015-11-29 21:07:03 +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 06134d5f19 Merge pull request #13104 from GunHog/OfTeleportsAndNames
Hand Tele now displays its destination.
2015-11-29 21:06:01 +11:00
Jordie 97a3b3f3c7 Merge pull request #13097 from RemieRichards/patch-2
Updates Holopad code to use AltClick
2015-11-29 21:05:50 +11:00
Jordie 7b1a92885c Merge pull request #13024 from TheNightingale/Nighting
Elite Syndicate Hardsuit
2015-11-29 21:05:36 +11:00
Jordie ee3e5c4d3f Merge pull request #13074 from Yolopanther12/lightReplacerUpgrade
Adds Light Replacer Refilling With Box of Lights
2015-11-29 21:04:43 +11:00
Shadowlight213 2247efb278 Adds armor penatration. 2015-11-29 01:59:22 -08:00