1b4317d5ef
Merge pull request #20914 from ChangelingRain/godsarebetterthanmechs
...
You can no longer hide in a mech to avoid gods
2016-10-13 02:06:59 -05:00
dac03dfc07
Merge pull request #20931 from tgstation/RemieRichards-activehands
...
put_in_hands() now prioritises the active hand
2016-10-13 12:57:03 +13:00
e453ee2784
Adds a mining gear crate to cargo ( #20943 )
...
Cargo can now order a 2500 supply point crate that requires a QM or above to unlock. This crates contains a explorer suit, compact pickaxe, mesons, and a bag to hold ore with.
Allows QM to employ more miners so they don't have to get crappy EVA suits when they can just order everything a miner should have to find some ores.
2016-10-13 12:56:43 +13:00
7753b04a6c
Makes drag/drop that dont have any use call click ( #20774 )
...
Makes drag/drop that dont have any particular defined behaviour be treated as just click on the dragged object
2016-10-13 12:55:05 +13:00
07aa842064
Xenobiology QoL ( #20910 )
...
You can now store monkey cubes in bio bags; using bio bags on the consoles will load them with the monkey cubes inside the bags.
2016-10-13 12:50:07 +13:00
4e0a3deb73
github is being kind of weird about these conflicts
2016-10-12 10:00:45 -04:00
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
34bc9935ac
Merge pull request #20924 from KorPhaeron/frogs
...
Frog fixes and updates
2016-10-11 23:25:13 -05:00
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
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
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
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
ea51704f03
``put_in_hands()`` now prioritises the active hand
2016-10-11 18:28:52 +01:00
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
208e6e5edf
Ash flora can now spawn in small patches
2016-10-11 10:04:32 -04:00
9fae29a33c
Merge pull request #20884 from lzimann/alerts
...
Makes cyborg "Show alerts" verb a browser datum
2016-10-11 09:58:56 -04:00
b3b7421cd8
Merge pull request #20921 from TechnoAlchemisto/day1fixes
...
Fixes Cacti and Plant Bags
2016-10-11 09:47:19 -04:00
62f59a0682
Merge pull request #20894 from lzimann/cancelbuttons
...
Adds a cancel button to some inputs
2016-10-11 07:38:36 -05:00
c241d6079e
Frog fixes and updates
2016-10-10 23:33:48 -05:00
2b796efe54
Fixes plant bags and cacti.
2016-10-10 21:12:58 -07:00
1d6d7bda9c
Merge pull request #20763 from TechnoAlchemisto/Alchemy_pt_1
...
Adds plants to lavaland
2016-10-11 13:03:21 +11:00
622b0ce405
Desc fix
2016-10-10 18:57:20 -07:00
ef2efe392b
Merge errors, removes istype.
2016-10-10 18:34:36 -07:00
cd60b5c3dd
removes commented code
2016-10-10 17:47:37 -07:00
d296d7eb78
You can no longer hide in a mech to avoid gods
2016-10-10 19:30:40 -04:00
75fe1f07b9
Merge pull request #20881 from Jordie0608/newadminmetaisforcingbirdboatsotheycanavoidunjobbanningpeople
...
Various fixes to admin topic
2016-10-10 16:24:41 -05:00
9ab0b7a27e
Merge pull request #20813 from optimumtact/theurcat
...
Improvements to simple animal make_baby and Runtime
2016-10-10 16:10:49 -05:00
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
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
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
f1d3ea724a
who cares about burning bowls?! I dont.
2016-10-10 13:47:55 -07:00
8d63a5ee0f
Synthflesh can heal dead people ( #20819 )
...
* Deadflesh
* Carbons only
2016-10-11 09:46:28 +13:00
4e68c2ca95
Adds frogs ( #20775 )
2016-10-11 09:43:31 +13:00
cb295db91a
remake ( #20762 )
2016-10-11 09:41:43 +13:00
937b68bfc4
Emags will no longer work on Ratvar-serving cyborgs ( #20845 )
...
* That's right, your master is RATVAR.
* CONTROL YOUR INDENTATION
* it's a good thing there are people actually reviewing my code now
* syntax
2016-10-11 09:20:29 +13:00
d434ac96f4
Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1
...
# Conflicts:
# code/game/objects/items/weapons/storage/bags.dm
# code/modules/mining/lavaland/ash_flora.dm
2016-10-10 13:20:25 -07:00
26ef706ac6
Merge pull request #20873 from MrStonedOne/hubadubdub
...
Adds config option for hub, removes hub.dm, adds toggle hub admin verb
2016-10-10 16:00:18 -04:00
37f3b275d1
Fixes hub not taking effect in certain edge cases.
2016-10-10 11:11:45 -07:00
44e5e53f82
Removes my changes from topic.dm and add a cancel to teleporter console.
2016-10-10 14:04:16 -03:00
f80b6f8d07
adds cancel to a bunch of inputs
2016-10-10 18:07:10 +11:00
803e23e132
Updates prescription glasses and hipster glasses onmob sprites, removes green glasses ( #20807 )
...
* Swaggy glasses tbh
* Git merge thingy
2016-10-10 18:33:07 +13:00
b8ea78cd00
Improvements to simple animal make_baby and Runtime
...
Runtime now only stores the children she actually made, instead of
being the mother of every cat in the mob list like some kind of god cat
make_baby no longer spawns off for 400 seconds to set a flag
2016-10-10 05:10:57 +00:00
ce13143d9d
Replaces yet more istypes with helpers ( #20806 )
...
* uses more istype helpers
* oranges is inefficient
2016-10-10 17:48:35 +13:00
5cea8f8180
Changes the height.
2016-10-09 23:27:17 -03:00
d0bc42f189
Adds a cancel button to some inputs
...
- Teleport scrolls
- The admin-pm verb
- To add a ban(in the place where you put the ban reason)
- When you edit/add a new note.
2016-10-09 21:28:14 -03:00
ce40d29ead
Makes the pronoun helper proc names less horrifyingly long ( #20780 )
...
* why were these so LONG, what the fuck
* gosh
* pronoun agenda
the true agenda is killing coiax's squished lines
2016-10-10 12:28:25 +13:00
970f88c6b5
Merge pull request #20832 from X-TheDark/stock_fix_maybe
...
Possibly fixes exponentially increasing stock prices
2016-10-09 18:26:38 -05:00
632a997586
Merge pull request #20809 from optimumtact/mob_living
...
Reorder mob living destroy
2016-10-09 19:06:01 -04:00
7603a62c5b
Removed MAT_METAL=60 requirement from replacement light autolathe design, removed MAT_METAL=60 from replacement light materials
2016-10-10 00:01:36 +01:00
db5b96f78d
Merge pull request #20863 from ChemicalRascal/master
...
Make compressor efficiency good, not bad
2016-10-09 17:57:05 -05:00
Cheridan