7c293f0aa6
Spray cans contain flammable solvents
...
Also, spraying someone will stun them even if they lack a client.
2016-05-02 22:19:49 +01:00
d9aac22800
Code review
2016-05-01 16:10:00 +01:00
80a0e230e2
Suicide and RSF fix
2016-04-30 19:27:13 +01:00
51d3dc9242
Hand labeler
2016-04-30 18:44:01 +01:00
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
35a975f82b
Merge pull request #17221 from phil235/FixGib
...
Fixes bugs with gib()
2016-04-30 06:58:29 -05:00
e5ed72520e
Ports Cards Against Spess from Polaris (MERGEPLS) ( #15872 )
...
* Ports Cards Against Spess from Polaris
* moar
* more
* Moves cards to config files, adds a fuckton more
* ADDS THE FUCKING CARDS TO THE FUCKING MAP TAKE 3 HATE SALT
* fixes the maps, shuts travis THE FUCK UP
* fixes typo
* makes requested changes
2016-04-30 13:35:51 +02:00
d8db2a1643
Merge pull request #17224 from ChangelingRain/IDlock
...
Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of opening it
2016-04-30 05:32:42 -05:00
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
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
03e8f0da61
if you see something say nothing and drink to forget
2016-04-29 23:06:53 -04:00
8ef63673d5
if you see something say nothing and drink to forget
2016-04-29 22:14:04 -04:00
8a6d36061e
Each cable coil color now has inhands
2016-04-29 22:10:11 -04:00
d662b0e455
Merge pull request #17218 from phil235/FixTalkingInPipes
...
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
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
846d419b30
Moves tools from items.dmi to tools.dmi
2016-04-30 04:12:12 +03:00
0bbcc00c4d
Revert "Move some stuff from different layers to different planes"
2016-04-29 16:07:23 -05:00
7900f80544
Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge
...
Conflicts:
code/game/objects/structures/aliens.dm
2016-04-29 20:58:02 +02:00
b1c1925b7c
Change gib animation sprites to only loop once.
2016-04-29 20:48:56 +02:00
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
1e0c5acd1f
Merge pull request #17211 from phil235/FixThermiteBorg
...
Fix bundle: borg module, thermite, chairs
2016-04-29 13:22:50 -05:00
ae78dd582a
Merge pull request #17208 from phil235/FixMechaMaskToxin
...
Fix bundle and mech melee attack animation
2016-04-29 19:32:38 +03:00
2bd45f793b
Merge pull request #17239 from Core0verload/nanofix
...
One symbol fix
2016-04-29 10:23:35 -04:00
315c6619f4
Merge pull request #17193 from TechnoAlchemisto/belttweak
...
Tweaks some storage issues with the explorer belt.
2016-04-29 08:50:01 -05:00
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
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
21e554187d
Merge pull request #17056 from Bawhoppen/randomrebalances
...
Some random TC price rebalances
2016-04-29 15:44:02 +03:00
ce966f72c3
Merge pull request #16953 from Core0verload/onehalf
...
Adds a new derelict to space ruins
2016-04-29 15:23:50 +03:00
c986212ddb
Merge pull request #16778 from Robustin/commitcommoncult
...
The Cult Rises...
2016-04-29 15:10:16 +03:00
44c1917de2
One symbol fix
2016-04-29 13:48:36 +03:00
034500f622
Merge pull request #17188 from phil235/FixClosetStuffing
...
Fixes weird shit happening when clickdragging things from your
2016-04-28 23:49:34 -05:00
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
fbd16c77cd
Merge pull request #16934 from Core0verload/cargo
...
Changes to Stocks Console UI, cargo fixes
2016-04-28 23:22:17 -05:00
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
49dd259cbc
Attacking a locker or crate with an ID-containing object will toggle the lock instead of opening it
2016-04-28 22:34:37 -04:00
9b5950000e
overlay effect should be immune to explosions.
2016-04-29 04:21:08 +02:00
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
750eaa4a57
invisibility = 100 and 101 now use defines.
2016-04-29 01:00:05 +02:00
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
be57a223b5
Moves alien structure into the proper folder objs/structures/aliens.dm
...
Removes incorrect comment about forcedodge projectile.
2016-04-28 22:44:26 +02:00
5a627c5b66
Merge pull request #17166 from coiax/cargo-crates-1
...
New cargo crates to buy
2016-04-28 16:33:50 -04:00
173ee4a680
Merge pull request #17178 from ChangelingRain/plantdream
...
Adds plant DNA machine to Dreamstation
2016-04-28 22:50:34 +03:00
8d27948ed1
moves icons to mining.dmi as to avoid merge conflicts.
2016-04-28 12:21:15 -07:00
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
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
fd8942e70c
Adds survival pod windows to the code
...
* Adds survival pod windows to the code
* Light and dark pod flooring
* looks better
2016-04-28 10:57:39 -06:00
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
3c2f41c8d2
dreamstation maps
2016-04-28 10:34:33 -04:00
3fe4bbc706
Takes construction out of metal into talismans
2016-04-27 23:20:55 -04:00
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
Jack Edge
Cheridan
bgobandit
KorPhaeron
phil235
Jordie
Nerd Lord
c0
Razharas
phil235
TechnoAlchemist
Robustin