Commit Graph

11401 Commits

Author SHA1 Message Date
blobbernaut ac5c67d2a8 Update human_defense.dm 2015-10-24 13:26:44 -04:00
blobbernaut 66d724a9b3 Update human_defense.dm 2015-10-24 03:50:44 -04:00
blobbernaut 32641c20fd Update human_defense.dm 2015-10-24 03:29:56 -04:00
blobbernaut c8030a274c Update human_defense.dm 2015-10-24 03:28:09 -04:00
blobbernaut 7e1f9b1409 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Blobbernaut 2015-10-24 03:26:34 -04:00
Razharas eeef634a35 Merge pull request #12505 from phil235/AlcoholTweak
Changed the effects of alcohol to be more realistic.
2015-10-24 03:15:55 +03:00
Razharas a837494646 Merge pull request #12542 from KorPhaeron/xenobio
Gold slime extract buff
2015-10-24 03:14:59 +03:00
Remie Richards c164e41a21 Fixes drone inhands all being on the right 2015-10-24 00:39:19 +01:00
blobbernaut f327514d3d Fixes cloaks.
Cloaks actually provide the armor that they're supposed to now, hooray!
2015-10-23 16:50:37 -04:00
phil235 5ab3ad56db Merge pull request #12557 from RemieRichards/Ports-GoonTooltips-ByWireWraith
Ports goon tooltips made by Wirewraith
2015-10-23 22:16:22 +02:00
phil235 8f45876c96 Merge pull request #12499 from Shadowlight213/memeglasses
Adds an override var to glasses to allow them to see higher invis levels
2015-10-23 20:47:42 +02:00
Cheridan 89680225c0 Merge pull request #12590 from phil235/TransferAmountFix
Fixes changing transfer amounts not working for shaker
2015-10-23 13:33:13 -05:00
Remie Richards 5f96e49f93 Merge pull request #12541 from Anonus/bringing_spooky_back
Once again overhauls revenants
2015-10-23 18:12:15 +01:00
Nerd Lord 86aa4a49cd World.timer is go. 2015-10-23 13:06:18 -04:00
Cheridan ff05c5323f Merge pull request #12583 from Steelpoint/Beret
[NERF/ARMOUR] Lowers Sec Beret Defence To Helmet Value
2015-10-23 08:04:56 -05:00
Razharas b5120f0276 Merge pull request #12555 from Jordie0608/notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
Syndie nuke and closet mapped to shuttle
2015-10-23 12:29:44 +03:00
KorPhaeron 05fe1c8515 Editing on mobile phones is bad 2015-10-23 04:05:52 -05:00
KorPhaeron 82335324f3 Nevermind 2015-10-23 04:02:30 -05:00
Cheridan bbd9c8bcc2 Merge pull request #12553 from KorPhaeron/scanners
Removes research scanners from cyborgs
2015-10-23 00:45:22 -05:00
Nerd Lord d05c81c2d9 This should resolve conflicts and not fail to compile woo woo 2015-10-22 22:10:29 -04:00
Cheridan 6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
Remie Richards 2ad13eea59 Updates ToolTips system to V1.1, by Wirewraith 2015-10-22 21:40:16 +01:00
KorPhaeron 520fedd2cf Changed a few gun names 2015-10-22 18:52:40 +02:00
phil235 564857d3c9 Fixes changing transfer amounts not working for shaker, drinking glass and condiment bottle. And remove it from damp rag and shot glass, since they only have one possible tranfer amount. Fixes the shaker's name being capitalized for no reason (and without an \improper ). 2015-10-22 18:40:32 +02:00
Jordie0608 0d67f24e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
Conflicts:
	_maps/map_files/DiscStation/DiscStation.dmm
2015-10-23 01:01:02 +11:00
phil235 8fb8f61674 Merge pull request #12413 from Shadowlight213/Youknowthetruthanditwearscatears
Enables job restrictions for roundstart catpeople even if the config is off
2015-10-22 12:25:32 +02:00
Steelpoint 23f4ee77ea BeretChange 2015-10-22 15:08:40 +08:00
Razharas 467b28d263 Merge pull request #12533 from Jordie0608/ghoststoocannowenjoypointlessexposition
Local narrate to all mobs
2015-10-22 09:47:09 +03:00
Nerd Lord 773649067d /span> 2015-10-21 22:41:23 -04:00
Cheridan fd09e91f4c Merge pull request #12522 from optimumtact/readds_paralyse_sting
Readds the parasting
2015-10-21 19:06:19 -05:00
Cheridan 3128680825 Merge pull request #12547 from optimumtact/patch-3
removes comments that do not contribute to code understanding
2015-10-21 19:01:36 -05:00
phil235 fb7ad8b38f Merge pull request #12452 from Xhuis/radical
Radiation tweaks and a geiger counter
2015-10-22 01:13:00 +02:00
phil235 e85ae646a3 Merge pull request #12524 from kingofkosmos/newphotocopiericon
New photocopier icon
2015-10-22 00:51:10 +02:00
phil235 02bccf6cf8 Merge pull request #12536 from tgstation/RemieRichards-DroneHatFix
Fixes drone hats
2015-10-22 00:49:17 +02:00
phil235 afde447481 Merge pull request #12523 from MrStonedOne/patch-49
Fixes spiders locking up the MC with do_after's
2015-10-22 00:48:36 +02:00
phil235 21c4552576 Merge pull request #12487 from bgobandit/humanoids
Changes the text human ==> humanoid where applicable.
2015-10-22 00:41:19 +02:00
Nerd Lord 990be7a8bb Malfunction no longer gibs people in clonepods, despite how fun it is.
Defile now indicates tiles that have jaunt prevention removed.
Perfect soul chance increased slightly(still must have a ckey and be alive when the drain starts)
2015-10-21 18:36:30 -04:00
phil235 d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
Nerd Lord eb360674e4 Sparks first, THEN emag, so if the emag act spawns anywhere, the sparks appear while it's doing the emag act. 2015-10-21 14:21:24 -04:00
Nerd Lord c21fd722e9 Defile now rusts normal and rwalls at a very low chance.
Revenant abilities cause purple sparkles now.
Incidentally fixed up EMP pulses so they don't set the name and duration of the object they spawn for everything that spawns the object.
2015-10-21 14:05:59 -04:00
Remie Richards 910f280a3b Moves procs to appropriate files, Adds some sanity+feature wrapper procs for Tooltips, adds some UI style themed CSS classes to use as tooltip themes (Auto used by the wrapper if no theme specified) 2015-10-21 12:53:45 +01:00
Jordie e6ef77aeff Merge pull request #12520 from optimumtact/patch-2
Move autoadmin to a protected config datum
2015-10-21 18:42:52 +11:00
Jordie0608 1dee35a5f9 syndie nuke and closet mapped to shuttle 2015-10-21 18:27:29 +11:00
KorPhaeron db54e524e5 Scanners 2015-10-20 23:15:02 -05:00
Nerd Lord f98b5e4426 New, more purple and accurate icons for revenant abilities.
Also purple lightning woo woo
2015-10-20 21:16:30 -04:00
oranges 7e12a51ebf YEAH THIS HAPPENING
GET OUT
2015-10-21 13:13:12 +13:00
Cheridan 03161ef93a Merge pull request #12421 from phil235/AsphyxiationFIx
Fixes human not taking oxyloss damage when not breathing enough oxygen.
2015-10-20 17:06:24 -05:00
KorPhaeron 594582ed81 Xenobio 2015-10-20 16:43:55 -05:00
Nerd Lord 3469bcc4ac Max regen is displayed 2015-10-20 17:11:03 -04:00
Nerd Lord 7770c2071e Once again overhauls revenants:
Instead of supporting health and essence, with health being three times essence, essence is tripled and now acts as revenant health.
Draining a target is slightly shorter, but if the target is dragged away while you are draining, the drain will fail.
If you get exceptionally lucky, you can gain a higher essence regen cap from draining - this requires the target mob to have a ckey, be alive, and for RNG to favor you.
You can no longer abuse the spawns in reveal and stun to be invisible or move while draining a target(this is really awful I want a better way to do it)
Overload lights now has a wider range, but only shocks people adjacent to lights.
Defile damages windows slightly less and makes lights flicker for somewhat longer.
Malfunction no longer disables bots after emagging them.
2015-10-20 17:07:34 -04:00