fc4afd763d
Revert "Revert "Removed anti-drop implant from NukeOps uplink.""
2015-07-27 18:47:56 +01:00
159f35786d
Cooldown for Cyborg Headlamps
...
- Most causes of forced headlamp deactivation will turn them off for
either 10 seconds or the duration of the stun, whichever is longer.
- The Shadowling veil ability now shuts down a borg's headlamp for the
entire spell's cooldown.
2015-07-27 09:13:04 -05:00
dac815d698
Fixes the lizard gender issue.(updated version of SvartaSvansen's PR.
2015-07-27 15:30:06 +02:00
84ef074312
Revert "Removed anti-drop implant from NukeOps uplink."
2015-07-27 11:10:32 +01:00
b14f49efc5
Merge pull request #10826 from xxalpha/cyberplus
...
Removed anti-drop implant from NukeOps uplink.
2015-07-27 12:08:08 +02:00
c013cb3508
Add some logging to molotov
...
Who primed molotov and the area of priming
2015-07-27 20:18:50 +12:00
76d012bec2
Should probably let the demon actually use its powers still
2015-07-26 23:03:15 -05:00
05bbc1724c
Forgot a file how terrible
2015-07-26 23:00:21 -05:00
9ca23ebdeb
Bloodcrawl
2015-07-26 23:00:06 -05:00
b67068b5c5
Who is cool again. Also, observers aren't ghosts. (And I hate pointless whitespace.)
2015-07-27 02:26:59 +01:00
ccbb9c1e52
Redid chameleon proc
2015-07-26 16:38:00 -05:00
b018dd89fd
Fixes monkey lings not regenerating chems
2015-07-26 23:13:49 +02:00
ca40f140b0
Fixes Last Resort not working sometimes
...
Cuts egg time by a third
2015-07-26 22:33:51 +02:00
101eae808d
Gave Miner's salve a slight side effect when ingested, to show that it's designed to be applied, not ingested.
...
Changed secondary recipe of Miner's Salve to be a sheet of iron+ a sheet of plasma + a twinkie in a grinder. That seems more "ghetto chemistry"
Added grinder to mining station.
2015-07-26 16:18:59 -04:00
124599cd2c
Makes spider reagents work better
2015-07-26 22:14:50 +02:00
2bf89ef4be
Chameleon Eyewear
2015-07-26 13:49:50 -05:00
34b9a045fc
Fixes non carbon being stunned when thrown and hitting something dense.
...
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
2015-07-26 20:40:46 +02:00
198758e52d
Feedback
2015-07-26 20:11:03 +02:00
fa35ae91d7
Allows aliens to mine
2015-07-26 20:01:52 +02:00
a3099df65a
WrongWord
2015-07-27 01:38:29 +08:00
a5233a77d6
DescUpdate
2015-07-27 01:35:23 +08:00
c853ec49a9
Repathed disposal unit from machinery/disposal to machinery/disposal/bin. Moved some stuff around, split disposal.dm into disposal-structures.dm and disposal-unit.dm , the latter containing both disposal bin and delivery chute.
2015-07-26 16:20:21 +02:00
b48eab3c43
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixingthingslikewillsmithfixedthewildwest
...
Conflicts:
icons/obj/guns/energy.dmi
2015-07-26 18:29:51 +10:00
1c59a84660
Dumb byond stuff fixed and merge conflict fixed for the gazillionth time.
2015-07-25 16:19:21 -07:00
8e97d19546
Merge pull request #10811 from Incoming5643/Take_a_number
...
Clears up define troubles for human/carbon mobs
2015-07-25 15:02:04 +02:00
f5ae59a046
Merge pull request #10700 from Ergovisavi/more_fire
...
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
0034e5a8f3
Merge pull request #10802 from bgobandit/monkeyrecyclingfix
...
Monkey recycler message now changes to reflect part upgrades.
2015-07-25 19:47:48 +10:00
9fbabcc305
Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe
...
Change many ERROR() calls into thrown exceptions
2015-07-25 19:22:46 +10:00
3fefa5f6fa
Merge pull request #10793 from bgobandit/thewaggening
...
Non-mutant humans can no longer wag their tails.
2015-07-25 19:11:50 +10:00
6e60aa2f08
Merge pull request #10791 from phil235/BeakerFeedingFix
...
Fixes beaker feeding
2015-07-25 19:11:21 +10:00
ad2d7e1d0f
Merge pull request #10789 from kingofkosmos/reentercorpselink
...
Clickable re-enter corpse links
2015-07-25 19:10:06 +10:00
644bd9bbf7
Merge pull request #10727 from Incoming5643/event_flags
...
Adds a few holidays to the holidays datum
2015-07-25 19:09:10 +10:00
f7e4297273
Merge pull request #10705 from KorPhaeron/golem
...
Golem Logging
2015-07-25 19:08:56 +10:00
444614dcf7
sql fixes
2015-07-25 12:05:19 +10:00
c868336e78
Removed mixing messages as they didn't make sense. Also changed istype checks to iscarbon checks.
2015-07-24 19:44:33 -04:00
864ce2c525
Added a new medication, Miner's Salve
2015-07-24 19:04:55 -04:00
8a30b30e44
&= ~ instead of -=
2015-07-25 00:19:19 +02:00
a2bbad9985
Changes mob swap to use Move(). This fixes mob swapping not respecting pass_flags and density, not making mobs slip.
2015-07-24 23:41:46 +02:00
4c25db479b
buffs out a few of the bigger holidays celibration periods
2015-07-24 13:21:02 -04:00
0d9f7dcb4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-24 11:58:52 -04:00
c8a5661e82
Ninja invisibility now turns off at <= 0 charge, Ninja invisibility effects moved to animate() instead of ancient anim()
2015-07-24 16:26:59 +01:00
45ebc998de
Fix
2015-07-24 19:37:55 +08:00
242ba82a50
ERTDescForAdmins
2015-07-24 19:19:36 +08:00
2e3caf5c85
Merge pull request #10736 from xxalpha/shakeitoff
...
Fixed changeling shields dropping when ling is prone.
2015-07-24 06:59:23 -03:00
fa686dbfef
Made it possible to emag a cyborg more than once.
2015-07-24 10:15:00 +01:00
8740dae264
Fix
2015-07-24 16:40:27 +08:00
66db30a73c
RifleBuff
2015-07-24 16:11:59 +08:00
407641a2c1
DSProposedChange
2015-07-24 16:09:42 +08:00
82727498b3
Removed anti-drop implant from NukeOps uplink.
2015-07-24 08:49:54 +01:00
680a560d76
Merge pull request #10783 from bgobandit/corgiburger
...
Re-adds corgi burgers.
2015-07-24 01:12:12 -05:00
xxalpha
GunHog
phil235
Thunder12345
Swag McYolosteinen
Orange Borg
KorPhaeron
Fayrik
AnturK
Mike Long
Steelpoint
Jordie0608
Chiefwaffles
phil235
Incoming5643
bgobandit
Remie Richards
Aranclanos
Cheridan