Commit Graph

20919 Commits

Author SHA1 Message Date
Razharas b3ed636d3c Merge pull request #13034 from kingofkosmos/shardspacenoslip
Stops glass shards from hurting you in space
2015-11-17 05:33:15 +03:00
duncathan salt 621c9e28c1 Merge pull request #13062 from optimumtact/chemchanges
Chemistry Balancing and Additions
2015-11-16 17:42:08 -06:00
Tkdrg 92e2dc1b2b Fixes antag huds disappearing on transfer_to()
I am retarded please merge asap
2015-11-16 19:53:33 -03:00
Razharas 389f4e3779 Fixes bloodpacks
Fixes bloodpacks
2015-11-17 01:10:41 +03:00
Razharas fd531118f4 Merge pull request #13037 from bgobandit/bloodlabels
Adds the ability to label blood packs.
2015-11-17 01:07:06 +03:00
Razharas 7489f929f2 Merge pull request #12964 from GunHog/Nanotrasen_Pindication
Reduces Loyalty Firing Pin tech requirement
2015-11-17 00:59:41 +03:00
bgobandit 4dee16a13d canusetopic for ayyranclmaos 2015-11-16 16:53:19 -05:00
GunHog a254c87e35 Reverts the removable change. 2015-11-16 09:59:45 -06:00
Cheridan fe369f268b Merge pull request #13029 from optimumtact/patch-2
Fixes admin message about borg lockdown
2015-11-15 20:59:46 -06:00
Razharas e9dae3be88 Merge pull request #13015 from SuperSayu/Holodecker
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03:00
Vincent faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
Razharas 70391716e7 Merge pull request #12400 from bgobandit/cakehatbugs
Cake hats now properly emit light.
2015-11-16 03:01:07 +03:00
duncathan salt 1a54000a35 Merge pull request #13020 from Xhuis/this_pr_was_a_time_sink
Sink changes
2015-11-15 16:02:14 -06:00
duncathan salt 30ea5ba36d Merge pull request #13026 from Anonus/blightmode
Revenant Changes LXIX
2015-11-15 16:01:11 -06:00
duncathan salt 3860981936 Merge pull request #13025 from tkdrg/imdumb
Improves antag_hud transfer_to() logic
2015-11-15 15:59:51 -06:00
duncathan salt 7f48bf70f5 Merge pull request #13027 from tkdrg/FUK
Pickup() improvements
2015-11-15 15:59:05 -06: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
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
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
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
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