Commit Graph

6858 Commits

Author SHA1 Message Date
Jack Edge 51d3dc9242 Hand labeler 2016-04-30 18:44:01 +01:00
Jack Edge 3d458b857c Service cyborgs get a spraycan
🆑 coiax
rscadd: The Service cyborg module now has a spraycan built in, for
hijinks and passing on important urban messages.
/🆑
2016-04-30 15:26:22 +01:00
Cheridan 55514c3be6 Merge pull request #17233 from coiax/mining-item-stats
Added more stat tracking to mining items and engine generation
2016-04-30 08:21:41 -05:00
phil235 84dcf0dd3f dammit. 2016-04-30 12:33:12 +02: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
Cheridan d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
Cheridan 34dd0e5b02 Merge pull request #17018 from KorPhaeron/megafauna
Megafauna
2016-04-29 20:27:21 -05:00
KorPhaeron 209a3d3e8e Legion is behind the door 2016-04-29 19:42:20 -05:00
KorPhaeron eecd2942b3 Fixes dragon spamming explosion logs 2016-04-29 17:13:34 -05: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
Cheridan 1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg
Fix bundle: borg module, thermite, chairs
2016-04-29 13:22:50 -05: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 29baead8a5 Merge pull request #17165 from Incoming5643/no_cat_cucks
Fixes? Catsploision? [Maybe?]
2016-04-29 11:18:24 -05: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 c986212ddb Merge pull request #16778 from Robustin/commitcommoncult
The Cult Rises...
2016-04-29 15:10:16 +03:00
Jack Edge fd8f0e425f Added statistics to mining and lavaland 2016-04-29 09:40:12 +01: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
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 d3fa99e58b Fixes runtime when thermiting a wall
Fixes not being able to put down a chair on a tile with a border window.
Fixes Borg module cycling not working when the first module is empty.
2016-04-28 20:44:02 +02: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
KorPhaeron 137da8bb57 Noise for drinking potion, GPS is abstract 2016-04-28 10:09:35 -05:00
KorPhaeron ae989b2700 Death sound refactor, dragon fixes, dragon dead icons 2016-04-28 09:06:37 -05:00
KorPhaeron 75f92ae43f Pixel offset fix 2016-04-28 04:49:05 -05:00
KorPhaeron 54213b51b7 Dragon Layer Fix 2016-04-28 04:44:47 -05:00
KorPhaeron 9bc3b65c38 Updates goliath hide path 2016-04-28 04:22:19 -05:00
KorPhaeron f572ae0b88 Merge remote-tracking branch 'refs/remotes/tgstation/master' into megafauna 2016-04-28 04:21:09 -05:00
KorPhaeron 7cc2d242ac Path typo fix 2016-04-28 04:13:26 -05:00
KorPhaeron 51452a2214 Dragon Loot 2016-04-28 04:11:42 -05: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
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 8a9422e45f derp, copypasta error 2016-04-28 00:24:50 +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
KorPhaeron 224b12b6ba Slight Dragon Nerf 2016-04-27 15:09:14 -05:00
KorPhaeron 44b276859e Merge pull request #17140 from ChangelingRain/shaketheroom
Charger holoparasites now shake the target's camera
2016-04-27 13:24:54 -05:00
Incoming5643 f612c83c87 negates nullcats 2016-04-27 14:23:38 -04:00
Cheridan eb7b0e528c Merge pull request #17097 from Shadowlight213/Jetpackimplant
Fixes jetpack implant speed boost inconsistency.
2016-04-27 13:13:28 -05:00
KorPhaeron 779cb69669 Dragon 2016-04-27 10:56:18 -05:00
Incoming f1e840fd1c Shuffles a line that could have potentially been delayed from running by rapid catting. The delay of reading said line might have allowed "deploy_the_cats" to fire more than once. 2016-04-27 10:37:20 -04: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
Nerd Lord fe0f4e2ad0 Charger holoparasites now shake the target's camera 2016-04-26 11:22:22 -04:00
KorPhaeron 421df42dcd Even edgier legion sprites from Cheridan 2016-04-26 04:19:21 -05:00
KorPhaeron 08eca42e00 Merge pull request #17061 from TechnoAlchemisto/Bracers
Adds craftable bracers, adds watchers dropping bones.
2016-04-26 01:39:50 -05:00
KorPhaeron c1987f699a Merge pull request #17093 from RandomMarine/cockroach
Drones stop squishing cockroaches.
2016-04-26 01:17:40 -05:00
KorPhaeron 5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR
Makes goliath plates stackable.
2016-04-25 22:35:43 -05:00