Commit Graph

7073 Commits

Author SHA1 Message Date
Cheridan
09252b4f4b Merge pull request #15657 from KorPhaeron/abductor
Abductor Airlocks
2016-02-22 00:05:15 -06:00
phil235
54db9ded4d Moved janitorial sign in a new weapons/miscellaneous.dm
Made holosign_creator/afterattack() a bit better.
Fixed merge conflict fixing error.
Fixes typos in holosign_creator.dm
2016-02-22 01:44:53 +01:00
phil235
2ec892a1fc Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier
Conflicts:
	icons/effects/effects.dmi
2016-02-22 01:34:20 +01:00
AnturK
2f688f2b64 Merge pull request #15635 from KazeEspada/barfights2
Bar Fights 2
2016-02-21 19:36:33 +01:00
KazeEspada
ac7aed2cb7 Removes parentheses
Really? Really?
2016-02-21 10:56:57 -07:00
tkdrg
50bbd40ff4 Merge pull request #15641 from kingofkosmos/toiletgrammarfix
Urinal message span fix
2016-02-21 09:41:10 -03:00
KorPhaeron
3f439b211c Abductor Airlocks 2016-02-21 00:01:54 -06:00
KazeEspada
9a33d27e05 Wooden chairs added. Inhands in WJohnston's pull. Fixed an issue with spawning to many sheets upon smashing. 2016-02-20 14:25:29 -07:00
KorPhaeron
1485297a64 Fixes dme, can't store knife 2016-02-20 14:57:06 -06:00
KorPhaeron
83ec0ed002 Merge remote-tracking branch 'refs/remotes/tgstation/master' into techno_alchemist
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
2016-02-20 14:49:30 -06:00
tkdrg
f81e52c164 Merge pull request #15605 from phil235/StreamSpray
Spray bottles now have a "stream" mode toggled by clicking the bottle.
2016-02-20 11:56:33 -03:00
kingofkosmos
63a6021aa7 Changes a toilet attack message span and changes few instances where using "you" is possible.
Fixes #15637
2016-02-20 15:53:30 +02:00
KazeEspada
116cf0ba77 forgot to commit a file 2016-02-19 22:44:23 -07:00
KazeEspada
40ca05b70d Enhances barfights by making chairs smash against people. If they are weak enough, the act of smashing will knock them on their ass.
Also some backend stuff to make chairs more readable.
2016-02-19 22:15:37 -07:00
Joan Lung
c576c42e06 Merge pull request #15619 from KazeEspada/chairfixes
Chair Fixes.
2016-02-19 22:57:52 -05:00
KazeEspada
2de3fac2f4 Chairs can no longer be stacked with dense items(rare) or dense structures. As well as chairs. 2016-02-19 20:47:43 -07:00
tkdrg
78ad41b8ec Merge pull request #15052 from xxalpha/uhhhhh
Added new event: portal storm.
2016-02-19 21:08:16 -03:00
duncathan salt
6458b524a0 Merge pull request #15615 from ChangelingRain/nottheblob
Blobbernauts and blob spores are now immune to blob chemicals
2016-02-19 15:51:41 -06:00
Nerd Lord
37eee7c302 keep the heal effect within the tile okay 2016-02-19 14:02:53 -05:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
KazeEspada
4305097ace Properly typecasts user var on place. 2016-02-18 21:56:24 -07:00
KazeEspada
fd3557761c Fixes the wrong proc being used. 2016-02-18 20:32:00 -07:00
KazeEspada
fff4639bca Fixes an issue where you would plant a chair while moving hands.
Sets the block chance on declaration rather then on instantiation.
2016-02-18 20:29:37 -07:00
phil235
61666cca3a Forgot to handle damage from thrown weapons. 2016-02-19 03:05:50 +01:00
KorPhaeron
1ec9f757cc Merge pull request #15591 from Lobachevskiy/telebaton-fix
Fix police and telebatons ignoring shields
2016-02-18 19:49:54 -06:00
phil235
8b2708ff9a Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator). 2016-02-19 02:34:57 +01:00
Nerd Lord
59d342af3a Blobbernauts and blob spores now have healing effects when being healed by the blob.
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
2016-02-18 17:11:59 -05:00
phil235
eaef2e842a Spray bottles now use a "stream" mode toggled by clicking the bottle.
The stream mode launches a chem puff that does not react with objects or turfs on its trajectory, it only reacts with standing mobs in its way, the puff doesn't go through the mob and is immediately deleted after reacting, or with the things on the last tile it can reach.
This mode is the initial mode for the nukeops chemsprayer (but the mode can still be toggled if you want to spray things on many tiles). Also the chemsprayer always spray 10 units per use now, and its range in spray mode is reduced to 4 tiles (so player aren't confused by the puff doing nothing when they aim very far and the amount transfered to each tile encountered is very low(amount is divided by range))
Fixes the chem puff appearing behind mobs it passes through.
2016-02-18 20:55:40 +01:00
AnturK
884b6c3415 Chair hitsound 2016-02-18 17:55:39 +01:00
AnturK
56d2a34201 Splits beds and chairs
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
KorPhaeron
633cb4d1a3 Bo staff fix 2016-02-17 23:05:25 -06:00
KorPhaeron
9992a7cc7d Tribal Knife 2016-02-17 22:37:23 -06:00
KorPhaeron
0d8a181ee7 Knife 2016-02-17 22:33:33 -06:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
Cheridan
bb00bd311f Merge pull request #15513 from KorPhaeron/chaplain3
Four more holy weapons
2016-02-17 19:48:06 -06:00
Lo6a4evskiy
43207c3070 Fix police and telebatons ignoring shields 2016-02-18 02:57:32 +04:00
xxalpha
1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
phil235
5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Cheridan
c1a1e90ca7 Merge pull request #15536 from optimumtact/spidersspiderseverywhere
Don't allow every single spider to be player controllable
2016-02-16 15:47:15 -06:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes
Fixes blindness overlay after reviving.
2016-02-15 23:17:55 +01:00
oranges
b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +13:00
KorPhaeron
fbc55d391a Removes silly references 2016-02-15 04:14:27 -06:00
Remie Richards
e8426a26da Merge pull request #15505 from ChangelingRain/sleeplesscarp
Sleeping carp gang no longer has special equipment
2016-02-15 03:05:04 +00:00
phil235
e3bbcb0f7f Fixes revive() not properly removing the blind overlay. (fixes staff of healing)
Fixes revive() working on brainless carbons, making them die right away. It now only heals the body but doesn't actually make the mob alive again.
Fixes dead mob put into closet and then revived not seeing the closet vision overlay.
Fixes brain mob's emp_damage never decreasing when stat == DEAD.
Fixes posibrain's brainmob starting dead.
Fixes ai fixing not clearing the blind overlay properly.
Fireball projectile no longer explodes on the firer when there's a body on their tile. The fireball's range() code now only checks the two tiles on its front left and front right for mobs to hit.
Remove some update_vision_overlays() (now unused) that I forgot to remove.
Using a staff oh healing on a corpse with a damaged brain organ will revive the mob and heal the brain organ.
2016-02-14 15:26:46 +01:00
KorPhaeron
e6dbea2184 More holy weapons 2016-02-13 21:42:36 -06:00
Nerd Lord
7c183d448e Sleeping carp gang no longer has special interactions. 2016-02-13 18:17:01 -05:00
tkdrg
c52a3e88d4 Merge pull request #15447 from KorPhaeron/holy_weapons
Three more chaplain weapons
2016-02-13 17:29:47 -03:00
tkdrg
e7af997785 Merge pull request #15441 from phil235/BrainChanges
Brain fixes and changes
2016-02-13 13:29:37 -03:00