Commit Graph

3169 Commits

Author SHA1 Message Date
Jack Edge
80a0e230e2 Suicide and RSF fix 2016-04-30 19:27:13 +01:00
phil235
04018648d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib
Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-30 12:30:36 +02:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake
Revert "Move some stuff from different layers to different planes"
2016-04-30 15:34:17 +10:00
Nerd Lord
03e8f0da61 if you see something say nothing and drink to forget 2016-04-29 23:06:53 -04:00
Nerd Lord
8ef63673d5 if you see something say nothing and drink to forget 2016-04-29 22:14:04 -04:00
Nerd Lord
8a6d36061e Each cable coil color now has inhands 2016-04-29 22:10:11 -04:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
KorPhaeron
8964eaebb7 Merge pull request #17259 from Core0verload/tools.dmi
Moves tools from items.dmi to tools.dmi
2016-04-29 20:31:29 -05:00
c0
846d419b30 Moves tools from items.dmi to tools.dmi 2016-04-30 04:12:12 +03:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205)
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
2016-04-29 20:29:20 +02:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin
Fix bundle and mech melee attack animation
2016-04-29 19:32:38 +03:00
KorPhaeron
315c6619f4 Merge pull request #17193 from TechnoAlchemisto/belttweak
Tweaks some storage issues with the explorer belt.
2016-04-29 08:50:01 -05:00
Razharas
6f8b1bc295 Merge pull request #17124 from MrPerson/wrapped_up_nicely_with_a_bow
Removes monkeycube and chocolate unwrapping
2016-04-29 16:03:59 +03:00
Razharas
81dadcec5f Merge pull request #17086 from MrPerson/planes_on_a_snake
Move some stuff from different layers to different planes
2016-04-29 15:51:41 +03:00
Razharas
21e554187d Merge pull request #17056 from Bawhoppen/randomrebalances
Some random TC price rebalances
2016-04-29 15:44:02 +03:00
Razharas
c986212ddb Merge pull request #16778 from Robustin/commitcommoncult
The Cult Rises...
2016-04-29 15:10:16 +03:00
Cheridan
1e800a04b4 Merge pull request #17186 from phil235/FixMisterSlotFlag
Fixes the backpack watertank's water mister spray being equippable on…
2016-04-28 23:24:45 -05:00
Cheridan
6e27f01c94 Merge pull request #17185 from phil235/FixBundle48
Fix Bundle: holosign creator, status procs, teleporter hub, timestop effect
2016-04-28 22:11:29 -05:00
phil235
2cc2341536 Fixes runtime when using gibself on an animal.
Fixes gib animation never appearing for carbons.
gib() now has a "no_organs" argument to not spill organs on gib().
gib() also no longer waits for the gib animation to finish before actually qdeling the mob (which was causing the possibility of multi-gibbing animation during cult sacrifice.
Gibself no longer spill organs.
Simple_animal no longer show "X stops moving" when gibbed.
2016-04-29 03:57:16 +02:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235
d5af5ca696 Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message().
Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100.
This fixes not being able to hear what you say while inside a hidden gas/disposal pipe.
Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller.
Fixes not hearing anything during a mob transformation.
2016-04-29 00:04:40 +02:00
Joan Lung
5a627c5b66 Merge pull request #17166 from coiax/cargo-crates-1
New cargo crates to buy
2016-04-28 16:33:50 -04:00
TechnoAlchemist
8d27948ed1 moves icons to mining.dmi as to avoid merge conflicts. 2016-04-28 12:21:15 -07:00
TechnoAlchemist
e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff
fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi
2016-04-28 12:03:31 -07:00
phil235
b8164b7b92 * Add an attack animation for mech melee attack.
* Fixes mech action button icon not updating whent the button is activated.
* Fixes internal tank action button icon not updating to off when we adjusted our masks out.
* Fixes mime/clown mask not updating their action button icon when adjusting. Fixes clown mask not updating
its on mob icon if adjusted when worn.
* Fixes typo in the human threshold for toxin in the air.
* Fixes changing the thermomachine circuitboard settings not giving any feedback.
2016-04-28 18:56:14 +02:00
Robustin
b5952c94cc Merge branch 'master' of https://github.com/tgstation/-tg-station into commitcommoncult
# Conflicts:
#	icons/obj/items.dmi
2016-04-27 22:04:06 -04:00
TechnoAlchemist
3a05479bdf Tweaks some storage issues with the explorer belt. 2016-04-27 19:00:34 -07:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz
Some sandbag changes
2016-04-27 20:23:21 -04:00
MrPerson
b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
phil235
bb9c99207d Fixes the backpack watertank's water mister spray being equippable on the belt when it shouldn't 2016-04-28 00:47:53 +02:00
phil235
2ad8d4a392 * Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.
* Fixes the lack of second argument in alien/stun()
* Fixes the sleeping alert not being updated properly when a mob asleep is killed then revived.
* Fixes timestop effect leaving mobs unable to move forever in some cases.
* Fixes teleporter hub and station staying active when the hub's panel is open, despite the hub's open panel sprite looking offline. The Hub and station now use their own iconfile icons/obj/machines/teleporter.dmi (similar what most machines have).

* I've moved all mob's status adjustment procs (Stun(), Paralyse(), blur_eyes() adjust_drugginess(), etc...) into specific files (named "status_procs.dm") so they're easier to find. I've added a third argument to stun adjustments procs to ignore the CANSTUN flag. I've also changed the weaken procs to have the ignore_canweaken argument be the third argument, so all status adjustment procs have amount as first arg, updating the mob or not as second, and when necessary an ignore_x as third arg.
2016-04-28 00:13:15 +02:00
Razharas
efa60f8587 Fixes BoHs
Fixes BoHs
fix https://github.com/tgstation/-tg-station/issues/17173
2016-04-27 21:33:36 +03:00
Jack Edge
fa018861e8 New cargo crates to buy
Also some minor spelling fixes I noticed.

🆑 coiax
tweak: Internals Crate now contains breath masks and small tanks.
rscadd: Metal foam grenade box crate added for 1000 points
rscadd: Added two Engineering Mesons to Engineering Gear Crate
tweak: Engineering Gear now costs 1300
rscadd: Breach Shield Generator Crate added for 2500 points
rscadd: Grounding Rod Crate added for 2500 points
rscadd: PACMAN Generator Crate added for 2500
rscadd: Defibrillator Crate added for 1500
rscadd: Nanotrasen Customs report that some wide band suppliers have
been providing "alternative" firing pins. Nanotrasen reminds all
crewmembers that contraband is contraband.
/🆑

Laser tag firing pins (only allow gun to be fired with laser tag armor
of the appropriate colour) added to contraband.
Special clown firing pin (prank your friends) added to contraband.
2016-04-27 16:20:06 +01:00
Joan Lung
a5fffec3a4 Merge pull request #17137 from Razharas/BoHinBoHFix
Fixes drone or any other boh in boh abuse
2016-04-27 08:45:31 -04:00
KorPhaeron
12d5a910b5 Merge pull request #17119 from TechnoAlchemisto/Mining_Harness
Adds explorer belt to mining vendor.
2016-04-26 20:06:48 -05:00
TechnoAlchemist
926e351fee adds sinew restraints, changes sinew droprate. 2016-04-26 14:10:42 -07:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
Razharas
534d970567 Fixes drone or any other boh in boh abuse
Fixes drone or any other boh in boh abuse
2016-04-26 15:34:49 +03:00
TechnoAlchemist
18e1c7825d bigger 2016-04-25 19:40:51 -07:00
MrPerson
1a3aaff808 Removes monkeycube and chocolate unwrapping
Pointless time wasters that add nothing to the game experience. Also removed the two wrapped sprites for completeness.
2016-04-25 18:20:01 -07:00
TechnoAlchemist
04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00
Joan Lung
ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
KorPhaeron
121564f927 Merge pull request #17027 from optimumtact/patch-1
Properly revert the container drop code
2016-04-25 00:58:28 -05:00
KorPhaeron
d32bfc4dc1 Merge pull request #17041 from Bawhoppen/boh
Lets BoH hold mech parts
2016-04-25 00:53:53 -05:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235
0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00