oranges
7033fd08b0
Merge pull request #18488 from Core0verload/rnd_skip
...
Brings back RnD level skipping
2016-06-14 09:29:18 +12:00
oranges
f2790ba712
Merge pull request #18498 from KorPhaeron/megafauna2
...
Fixes megafauna being immune to severity 1 explosions
2016-06-14 09:22:24 +12:00
Joan Lung
d7b9d755c2
Merge pull request #18511 from lordpidey/closing_the_door_on_bugs
...
bolts of door creation can no longer destroy indestructible walls
2016-06-13 17:20:16 -04:00
KorPhaeron
8dddcacf67
Whoops
2016-06-13 06:45:58 -05:00
AnturK
50807d454b
Merge pull request #18494 from phil235/BlastDoor
...
Blast door fix and ling limb regen
2016-06-13 12:45:56 +02:00
oranges
eb30d5c84e
Merge pull request #18242 from LatD/machineprototype
...
Item to cargo for R&D engineering tech
2016-06-13 14:08:05 +12:00
oranges
314c6846d3
Merge pull request #18483 from Xhuis/when_i_say_ill_do_something_i_do_it
...
Adds caks
2016-06-13 14:06:55 +12:00
oranges
17c9a665de
Merge pull request #18485 from Incoming5643/jersey_uprising
...
Repairs Spray Tan
2016-06-13 14:05:29 +12:00
Kyle Spier-Swenson
2be36ce8cc
fixes shuttle rotation
2016-06-12 18:26:34 -07:00
Xhuis
295085f014
Heavily nerfs cak health
2016-06-12 19:01:54 -04:00
Xhuis
c095b2f976
Mind transfer and stat increase
2016-06-12 18:14:34 -04:00
oranges
d7c748a558
Merge pull request #18472 from phil235/HackyShit
...
Fixes Synths
2016-06-13 09:24:52 +12:00
Joan Lung
b689959a13
Merge pull request #18465 from Xhuis/left_laborer
...
Two small clock cult fixes and a tweak
2016-06-12 17:21:19 -04:00
Mike Long
a2b3276f63
bolts of door creation can no longer destroy indestructible walls
2016-06-12 15:59:22 -04:00
KorPhaeron
b3b9e8b69e
Fix
2016-06-12 09:39:00 -05:00
KorPhaeron
1f8cb5ef5e
Megafauna bomb resist
2016-06-12 08:24:43 -05:00
Joan Lung
80f762c4f8
FALSE
2016-06-12 09:00:19 -04:00
Joan Lung
84a6edf527
Merge branch 'master' of https://github.com/tgstation/tgstation into gratuitouspenetration
...
Conflicts:
icons/effects/blood.dmi
2016-06-12 08:37:13 -04:00
oranges
99620ffe76
Merge pull request #18481 from phil235/PlantsGunsShit
...
Moving code around
2016-06-13 00:14:29 +12:00
oranges
6eea6b4779
Merge pull request #18466 from Core0verload/proto_fix
...
Fixes protolathe not accepting any reagents
2016-06-13 00:08:14 +12:00
oranges
b20a5642de
Merge pull request #18473 from RemieRichards/setDir()
...
Set dir()
2016-06-13 00:03:44 +12:00
oranges
fa9b86e64f
Merge pull request #18458 from Razharas/KudzuFix
...
Refactors kudzu on_hit processing, fixes bug
2016-06-13 00:02:03 +12:00
oranges
11c76f5bd7
Merge pull request #18444 from xxalpha/spesstiem
...
Wizard Spell: Spacetime Distortion
2016-06-13 00:01:23 +12:00
Jordie0608
0846d6f30d
fixes fire logging bracket
2016-06-12 20:58:55 +10:00
phil235
6227762d9b
Fixes blast doors not being crowbarrable when out of power.
...
Changeling regenerative stasis now regenerate limbs, except the head.
2016-06-12 12:45:07 +02:00
Xhuis
25a638d6af
Removes cherry bombs ( #18461 )
2016-06-12 02:01:16 -05:00
c0
8a5f46a859
Brings back RnD level skipping
2016-06-12 09:02:30 +03:00
Incoming
3e05af6492
repairs the rare orange skintone
2016-06-11 22:08:56 -04:00
Xhuis
e2cef7fca4
Fixes infinite donut duping
2016-06-11 21:11:15 -04:00
Xhuis
e467734e1f
Adds caks
2016-06-11 20:23:40 -04:00
Remie Richards
b3b60b187b
Manual repair of some edge cases.
2016-06-11 23:11:54 +01:00
phil235
dccc1e60a3
Let's not forget the new files.
...
Also some tiny fixes, typo, and things I forgot.
2016-06-11 23:52:35 +02:00
phil235
3b8af6f5ff
Fixes grille/New() not calling ..()
...
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
2016-06-11 23:18:26 +02:00
Cheridan
47e2f50de5
Merge pull request #18440 from JStheguy/slave
...
Easiest Fixes Ever Double Feature
2016-06-11 13:29:44 -05:00
Cheridan
81e6679aed
Merge pull request #18442 from drynwyn/Stupi
...
Removes a superfluous addition of the "slime" faction to slimepeople.
2016-06-11 13:14:13 -05:00
JStheguy
87ae4675fe
Unhides Jumpsuits
...
Wow, that was easier.
2016-06-11 12:52:23 -05:00
Remie Richards
fda2c699fc
Automatic conversion via Regex
2016-06-11 18:37:48 +01:00
Remie Richards
a041255b80
Adds setDir(), a hook to for running code when a dir change occurs, replaces "dir = X" statements
2016-06-11 18:26:53 +01:00
Xhuis
771448ae93
Allows deconversion of drones
2016-06-11 13:25:54 -04:00
Joan Lung
a21fae2865
this is so ugly but the alternate choice is trying to fix all of /attack() in this pr
2016-06-11 12:41:14 -04:00
Joan Lung
3228d1d906
Revert "why didn't it do this before fuck oh my god"
...
This reverts commit 1c19a6a2fb
2016-06-11 12:23:31 -04:00
phil235
9e5e525335
Fixes admantine golem female body icon. Now all golems have a female version.
...
The wizard can no longer choose to become a military synth.
2016-06-11 17:13:12 +02:00
LatD
5ecf4f2725
Raise the cost for now
2016-06-11 17:51:40 +03:00
phil235
cee58e55e7
All species now use the bodypart system to create their body sprite.
...
Removes procs admin_set_species, update_base_icon_state, update_color.
Removes base_icon_state human var.
Fixes synth being invisible. The falling disguise effect is simplified by using special damage overlays.
Removes the SPECIES layer, it's now no longer used.
2016-06-11 16:36:47 +02:00
Jordie
0777916328
Merge pull request #18402 from optimumtact/flamingfunremoval
...
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
Jordie
264aafbe23
Merge pull request #18378 from optimumtact/banditrevival
...
Photocopying secret documents actually works now
2016-06-11 23:52:02 +10:00
oranges
d97d8e6d6e
Merge pull request #18432 from Core0verload/newmask
...
Adds explorer gas mask for lavaland miners
2016-06-12 01:14:48 +12:00
oranges
29a1c6be5f
Merge pull request #18433 from KorPhaeron/standard_borg
...
New Standard Cyborg Module Gear
2016-06-12 01:13:33 +12:00
oranges
f58b13d099
Explicitly return parent value
...
This prevents it returning false incorrectly
2016-06-11 13:09:25 +00:00
oranges
bf9643563d
Ensure we only log and notify admins when person is set on fire
...
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
