Commit Graph

11804 Commits

Author SHA1 Message Date
duncathan salt 621c9e28c1 Merge pull request #13062 from optimumtact/chemchanges
Chemistry Balancing and Additions
2015-11-16 17:42:08 -06: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
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 30ea5ba36d Merge pull request #13026 from Anonus/blightmode
Revenant Changes LXIX
2015-11-15 16:01:11 -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
Cheridan caa7adeeba Merge pull request #13022 from tkdrg/morefix
R&D and Misc Fixes/Tweaks
2015-11-15 14:19:44 -06: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
duncathan salt 328c9537e7 Merge pull request #13013 from tkdrg/bugs
Logging improvements
2015-11-14 23:45:45 -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
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
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
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 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
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
Cheridan 894784acab Merge pull request #12967 from Anonus/burnbabyburn
Makes anomalies more dangerous
2015-11-13 22:23:34 -06: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
Kyle Spier-Swenson ca7c087d48 Fixes map loader incorrectly detecting x size in maps 2015-11-13 02:32:28 -08:00
Razharas a3bd89210a Shaves off 1568 iterations
Shaves off 1568 iterations
2015-11-13 10:57:42 +03:00
Razharas 8e38bb4b48 Makes space transition code fast and beautiful
Makes space transition code fast and beautiful
No more looping through all turfs in the world
520200 (255*255*8) iterations -> 57120(255*7*4*8) iterations
Almost 10 times faster, and less code too!
2015-11-13 10:31:34 +03:00
duncathan salt 67ae63161f Merge pull request #12938 from KorPhaeron/emitters
Allows you to var edit emitter projectiles
2015-11-13 00:16:11 -06:00
hornygranny b5e12f9faf wastes a get
wastes a get
2015-11-12 19:45:06 -08:00
Nerd Lord cd31b8d74b Plasmamen can now man the bar. 2015-11-12 22:38:10 -05:00
as334 d39982e98a Small tweak for Cheridan 2015-11-12 22:09:26 -05:00
as334 a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
phil235 5268a2613f Merge pull request #12994 from phil235/ReagentObfuscation2
Reagent obfuscation (copy)
2015-11-12 23:25:55 +01:00
Xhuis e02831d5b1 Reagents can no longer be determined by examining a reagent container without the proper apparatus. Silicons and ghosts can always see reagents.
Science goggles now allow reagents to be seen on examine. In addition, chemists now start wearing them. The bartender has a pair that looks and functions like sunglasses.
2015-11-12 23:01:33 +01:00
duncathan salt df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
phil235 9e3b7610ff Merge pull request #12959 from tkdrg/abranch
Fixes adjust_fire_stack to work with macro Clamp()
2015-11-12 20:15:06 +01:00
phil235 e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun.
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
2015-11-12 19:45:50 +01:00