Commit Graph

38998 Commits

Author SHA1 Message Date
phil235 6cfd99ec00 Moving shit around and APC repair bugfix (#20912)
* Moving shit around so turfs aren't defined in code/modules/mining .
Fixes APC's integrity not being reset to max when a broken APC is repaired.

* derp

* More turf and turf procs moved.

* fixing merge conflicts again.
2016-10-12 09:48:47 +02:00
Cheridan 34bc9935ac Merge pull request #20924 from KorPhaeron/frogs
Frog fixes and updates
2016-10-11 23:25:13 -05:00
tgstation-server 524dcac92a Automatic changelog generation for PR #20909 [ci skip] 2016-10-12 03:48:46 +00:00
Joan Lung 7332e4c190 Merge pull request #20909 from XDTM/TrappedInHereWithMe
Increases airlock resistance
2016-10-11 23:48:44 -04:00
tgstation-server 250f780c5d Automatic changelog generation for PR #20899 [ci skip] 2016-10-12 02:52:50 +00:00
Cyberboss a2a9dc7c60 Fixes motion alarms (#20899)
Fixed motion alarms instantly triggering and de/un/re/triggering

The relevant changes are in motion.dm and ai_monitored.dm. 

Everything else is a replacement of /area/turret_protected -> /area/ai_monitored/turret_protected which is why this PR is a bitch
2016-10-12 15:52:49 +13:00
tgstation-server 391567cdc6 Automatic changelog generation for PR #20902 [ci skip] 2016-10-12 02:49:00 +00:00
XDTM 87d1b821d8 Slime cores deleted on use (#20902)
Exhausted slime extracts will now dissolve instead of leaving useless used slime extracts.


Slime cores won't be consumed if the reaction outputs chemicals, or if the slime core has extra uses from a cerulean slime.
2016-10-12 15:48:59 +13:00
uraniummeltdown e9f9b5a600 You can now collect ore by walking over it with satchel equipped (#20735)
* addressed a few problems

* it finally works perfectly

* all good now

* better code
2016-10-12 15:30:39 +13:00
Joan Lung 2f6f8a4748 Fixes antag spawners (#20882)
* Fixes antag spawners

* compiling is nice

* Let's assume usr has died...

* wizaaaard

* no runtimes
2016-10-12 09:53:47 +13:00
oranges 437129c3f1 Merge pull request #20888 from erwgd/ReplacementLightsHaveMetal
Replacement lights no longer require 60 metal in autolathe
2016-10-12 09:02:15 +13:00
phil235 cc947b1eeb Fixes spacevines being immune to melee attack (typo). (#20907)
Fixes robotic legs missing a side to their sprite.
Fixes blob attacks destroying objs below intact floors (the blob's attack does not remove the floor's tile)
Now all objs hidden below floors don't take damage from fires, instead of just pipes and cables.
2016-10-12 09:01:03 +13:00
tgstation-server f0d7e35d62 Automatic changelog generation for PR #20908 [ci skip] 2016-10-11 20:00:17 +00:00
Cyberboss cd2e93317a Fixes door timing mode (#20908)
Door timer was 5 ticks too slow
2016-10-12 09:00:16 +13:00
Leo 74c47e1b57 Fixes secure safe having two attackby. (#20911) 2016-10-12 08:58:41 +13:00
tgstation-server 469ecc8e9a Automatic changelog generation for PR #20892 [ci skip] 2016-10-11 19:57:34 +00:00
WJohn faa67abf39 Excessively improves various sprites. (#20892)
* Edits the color palette across DMIs touched in my previous PRs, resprites or recolors candles and cards.

* Somehow that line of colors didn't get changed. Whoops!

* HOW DID I MISS TWO PIXELS IN THE LAST COMMIT??
2016-10-12 08:57:32 +13:00
XDTM 0ad81fe12f More balance 2016-10-11 20:56:21 +02:00
tgstation-server 3c753eb679 Automatic changelog generation for PR #20856 [ci skip] 2016-10-11 14:39:13 +00:00
Razharas 5ced570b3e Merge pull request #20856 from ChangelingRain/coreprocessidiocy
You can now deconstruct AI cores that contain no AI
2016-10-11 18:39:12 +04:00
sybil-tgstation13 872b242c7f Automatic changelog compile, [ci skip] 2016-10-11 14:28:51 +00:00
Joan Lung c96fa7e2dd jump... 2016-10-11 10:25:07 -04:00
Joan Lung 9fae29a33c Merge pull request #20884 from lzimann/alerts
Makes cyborg "Show alerts" verb a browser datum
2016-10-11 09:58:56 -04:00
tgstation-server c82998ee2b Automatic changelog generation for PR #20921 [ci skip] 2016-10-11 13:47:21 +00:00
Joan Lung b3b7421cd8 Merge pull request #20921 from TechnoAlchemisto/day1fixes
Fixes Cacti and Plant Bags
2016-10-11 09:47:19 -04:00
Cheridan e0c8f9bb12 Merge pull request #20887 from ChangelingRain/clockcultfixes
Clockcult fixes
2016-10-11 07:52:53 -05:00
Cheridan 62f59a0682 Merge pull request #20894 from lzimann/cancelbuttons
Adds a cancel button to some inputs
2016-10-11 07:38:36 -05:00
KorPhaeron c241d6079e Frog fixes and updates 2016-10-10 23:33:48 -05:00
TechnoAlchemist 2b796efe54 Fixes plant bags and cacti. 2016-10-10 21:12:58 -07:00
sybil-tgstation13 81a496e0ca Automatic changelog compile, [ci skip] 2016-10-11 02:03:55 +00:00
tgstation-server db2e06ee73 Automatic changelog generation for PR #20763 [ci skip] 2016-10-11 02:03:22 +00:00
Jordie 1d6d7bda9c Merge pull request #20763 from TechnoAlchemisto/Alchemy_pt_1
Adds plants to lavaland
2016-10-11 13:03:21 +11:00
TechnoAlchemist 622b0ce405 Desc fix 2016-10-10 18:57:20 -07:00
TechnoAlchemist ef2efe392b Merge errors, removes istype. 2016-10-10 18:34:36 -07:00
TechnoAlchemist cd60b5c3dd removes commented code 2016-10-10 17:47:37 -07:00
Cheridan 75fe1f07b9 Merge pull request #20881 from Jordie0608/newadminmetaisforcingbirdboatsotheycanavoidunjobbanningpeople
Various fixes to admin topic
2016-10-10 16:24:41 -05:00
Cheridan 1eadedea97 Merge pull request #20810 from optimumtact/malflists
Better check for milestone in the doomsday device
2016-10-10 16:18:33 -05:00
Cheridan 9ab0b7a27e Merge pull request #20813 from optimumtact/theurcat
Improvements to simple animal make_baby and Runtime
2016-10-10 16:10:49 -05:00
tgstation-server 9ef3f943ab Automatic changelog generation for PR #20853 [ci skip] 2016-10-10 21:06:10 +00:00
Incoming5643 a963658b8e Makes transit space unjauntible, and removes a few spells restriction from the wizard den. There's nothing there you can't reach normally now except a mob that wants to kill you and some meat. (#20853)
Fixes an area error that was allowing jaunting from the wizard den after a LOT of creativity.
The radios in the wizards den should work now.
Fixes a rouge airless tile in the den.
Recompiles z2 as a dmm as it was erroring on mapmerge and it was in a very strange form that didn't match up with other dmm formated maps. It looks like everything is ruined, but I assure you everything just swapped around.
2016-10-11 10:06:08 +13:00
Joan Lung f51444d8fa Improves some cult rune checks (#20872)
* sword in the dawn

* don't fade away

* it's dumb, but not my problem.
also rearrange these checks~
2016-10-11 10:05:25 +13:00
tgstation-server ec1bf8cf8d Automatic changelog generation for PR #20744 [ci skip] 2016-10-10 20:57:05 +00:00
Shadowlight213 335c0ad690 Ports VG's antimatter engine shield sprites and adds the AM engine to cargo (#20744)
* Ports VG's antimatter engine shield sprites

* crate name
2016-10-11 09:57:04 +13:00
TechnoAlchemist f42889ee2a Fixes some altclick problems. (#20799)
* Fixes some forbidden capabilities, probably.

* drons fix

* isliving check (no underscore!!)

* !

* Phil's Fixes
2016-10-10 22:56:37 +02:00
TechnoAlchemist f1d3ea724a who cares about burning bowls?! I dont. 2016-10-10 13:47:55 -07:00
XDTM 8d63a5ee0f Synthflesh can heal dead people (#20819)
* Deadflesh

* Carbons only
2016-10-11 09:46:28 +13:00
tgstation-server 512e918e83 Automatic changelog generation for PR #20775 [ci skip] 2016-10-10 20:43:32 +00:00
KorPhaeron 4e68c2ca95 Adds frogs (#20775) 2016-10-11 09:43:31 +13:00
kevinz000 cb295db91a remake (#20762) 2016-10-11 09:41:43 +13:00
tgstation-server 7ce3688699 Automatic changelog generation for PR #20749 [ci skip] 2016-10-10 20:41:09 +00:00