Commit Graph

24890 Commits

Author SHA1 Message Date
NikNakFlak cf9b0dde3c I did this for you Incompetence 2015-11-15 14:51:51 -07:00
bgobandit f01fd1f942 Adds the ability to label blood packs. 2015-11-15 16:45:43 -05:00
bgobandit 5cdeabe0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into cakehatbugs
Conflicts:
	code/modules/clothing/head/misc_special.dm
2015-11-15 16:30:03 -05:00
Cheridan 0baf7610dd Merge pull request #12999 from Anonus/grillby's
Plasmamen can now man the bar
2015-11-15 14:26:58 -06:00
duncathan salt 59802d119a Merge pull request #12976 from tgstation/revert-12831-idedplsnerf
Revert "nerfs water"
2015-11-15 14:24:16 -06:00
Cheridan caa7adeeba Merge pull request #13022 from tkdrg/morefix
R&D and Misc Fixes/Tweaks
2015-11-15 14:19:44 -06:00
AnturK e4d8afa7d3 Makes HoG gods visible to observers with darkness off 2015-11-15 20:38:10 +01:00
AnturK 90dc10f2e2 Fixes HoG gods being visible to silicons 2015-11-15 20:35:00 +01:00
AnturK 8f4cbf12e5 Fixes revanant visibility for ghosts 2015-11-15 19:33:12 +01:00
Incoming f976a2ac1b too late I already found a different way to do this that's equally as unobjectionable 2015-11-15 12:41:17 -05:00
kingofkosmos 156d9b558c Crossing a glass shard in space without shoes won't hurt and stun the user anymore. 2015-11-15 17:19:07 +02:00
YotaXP 4ece522dff Removed snowflake. 2015-11-15 02:34:17 -05:00
Aranclanos 37ac44e9d6 Merge pull request #12985 from tkdrg/fuckme
Fixes posibrain ghost alert
2015-11-15 03:57:59 -03:00
Aranclanos b1b5e73907 Merge pull request #13018 from Cheridan/my_b
Fixes warning in anomaly_pyro.dm
2015-11-15 03:36:02 -03:00
Razharas 62cd83fa30 Merge pull request #12778 from AnturK/minor_upgrades
Mech Speech Bubbles, POI list for Observe
2015-11-15 09:07:21 +03:00
Razharas ff99c3d185 Merge pull request #13017 from tkdrg/hoghog
Fixes HoG picking restricted jobs as antag
2015-11-15 09:00:50 +03:00
duncathan salt 7923d549d3 Merge pull request #13016 from tkdrg/fixfixifix
Fixes ling revive exploit
2015-11-14 23:48:22 -06:00
duncathan salt 328c9537e7 Merge pull request #13013 from tkdrg/bugs
Logging improvements
2015-11-14 23:45:45 -06:00
duncathan salt ba90ab2361 Merge pull request #13010 from RemieRichards/HoGUpdate
HoG Update
2015-11-14 23:45:21 -06:00
duncathan salt a2a3a471c7 Merge pull request #13000 from hornygranny/master
wastes a get
2015-11-14 23:44:20 -06:00
duncathan salt f26a4fa106 Merge pull request #12992 from phil235/ProjectileSuicideFixes
Fixes your shield blocking the bullets when committing suicide with a
2015-11-14 23:43:55 -06:00
duncathan salt 31e30ab768 Merge pull request #12955 from CosmicScientist/FixingThePast
Makes the dehydrated carp less ambiguous and decreases its TC cost
2015-11-14 23:42:58 -06:00
Nerd Lord e7e10c1b7c If H and memes... 2015-11-14 23:24:36 -05:00
Xhuis 13a5fdb184 Makes atropine multiplication less hideous 2015-11-14 23:18:20 -05:00
Xhuis 727eda41e8 Restores old healing values to Restorative Nanites 2015-11-14 23:15:13 -05:00
duncathan salt 509c2da46f Merge pull request #13011 from KorPhaeron/really_bad_ideas
Veil Render Fix + spellbook balance
2015-11-14 22:08:48 -06:00
Incoming 1e2892bf31 There is now a config list in game_options.txt of which races should be playable at roundstart.
If the list is missing, it will default to which races are defined as roundstart in the species datums. Plasmamen have been removed from this list pending bugfixes.

If JOIN_WITH_MUTANT_RACE isn't set in config, humans only will still be enforced regardless.
2015-11-14 22:27:55 -05:00
Xhuis d51813a48f Chemistry rebalances and additions 2015-11-14 22:17:54 -05:00
Nerd Lord b91e32d0c3 Improves revenant ability sprites further.
Also tweaks icon proc slightly so it's easier to do testing stuff.
2015-11-14 20:56:11 -05:00
Remie Richards ff26ef3fff Merge pull request #13009 from MrStonedOne/patch-62
[Ready] Fixes map loader incorrectly detecting x size in maps
2015-11-15 01:20:04 +00:00
oranges edb139c2d2 Fixes admin message about borg lockdown
You will now correctly follow the robot when you click on their keyname
2015-11-15 14:09:12 +13:00
Tkdrg 11ab5901ee Pickup() improvements
Fixes flashlight exploit.
Removes unused proc can_use_hands().

Fixes #11282
2015-11-14 17:05:08 -03:00
Nerd Lord c04946908f Commit efficiency: low. 2015-11-14 14:46:44 -05:00
Nerd Lord bffa938df9 continue 2015-11-14 14:44:42 -05:00
Nerd Lord 1ff4f00791 The changelog is the PR, but:
Defile no longer directly affects mobs. Instead, it rips up floors and opens machines and lockers.
Blight added. Blight infects humans with a virus that does a set amount of damage over time and is relatively easily cured. Blight also badly affects nonhuman mobs and other living things.
Tweaked costs and stuntimes again.
Transmit has a new, spookier icon.
2015-11-14 14:13:12 -05:00
Tkdrg 459619594f Improves antag_hud transfer_to() logic
Fixes #13019
Fixes #11996
2015-11-14 16:06:01 -03:00
Cheridan 9a68f6b69b Merge pull request #13003 from Incoming5643/stop_being_broken_at_being_broken
The further trials and tribulations of the supermatter sword bugfix
2015-11-14 11:49:55 -06:00
TheNightingale dca36b1723 * Elite Syndicate hardsuit added
** Operative-only; fireproof, with bonus resistances
** Added to Operative uplinks
2015-11-14 17:43:43 +00:00
Tkdrg 8c694d9fc0 R&D and Misc Fixes/Tweaks
Fixes invisible gasmask exploit.
Fixes mineral duplication exploit in protolathe.
You can no longer break a RD Console while a linked machine is busy.
Adds cancel button to admin Send To.

Fixes #12729
Fixes #12197
Fixes #11741
Fixes #11449
2015-11-14 13:35:05 -03:00
Tkdrg d95139ca80 Fixes HoG picking restricted jobs as antag
This was still using the old system for some reason.
Also removes what looks to be some forgotten debug output, this is the
source of the "blank lines mid-round" bug.
2015-11-14 12:21:31 -03:00
Xhuis a24ddbd7b7 Sink changes 2015-11-14 09:44:39 -05:00
Cheridan d7bf779f2d Fixes warning in anomaly_pyro.dm 2015-11-14 00:23:05 -06:00
Jordie bc71a9264a Merge pull request #13008 from Razharas/SpaceTransFix
Makes space transition code fast and beautiful
2015-11-14 17:12:22 +11:00
Tkdrg a81c4dd857 Fixes ling revive exploit
Fixes #11961
2015-11-14 03:11:36 -03:00
Cheridan 894784acab Merge pull request #12967 from Anonus/burnbabyburn
Makes anomalies more dangerous
2015-11-13 22:23:34 -06:00
as334 ef6af4ef5b Unfucking shit ass plasma memes part 1 2015-11-13 21:28:00 -05:00
MMMiracles 90c55718af conflict fix oh vey 2015-11-13 16:27:03 -05:00
MMMiracles d0356f2741 more map changes, misc edits 2015-11-13 16:16:57 -05:00
Tkdrg 021b99badb Logging improvements
Fixes SMES deconstruction logging.
Radiation will no longer message admins unless a living mob is hit.
All rad pulses will still be saved to logs.
Also adds a JMP link to the rad pulse message.

Fixes #12442
Fixes #12609
2015-11-13 18:08:23 -03:00
Kyle Spier-Swenson 27aad8a3bc fucking Lummox JR's map loader treating chars and tiles as one 2015-11-13 10:22:52 -08:00