Commit Graph

7048 Commits

Author SHA1 Message Date
KazeEspada
ac7aed2cb7 Removes parentheses
Really? Really?
2016-02-21 10:56:57 -07: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
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
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
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
KorPhaeron
1ec9f757cc Merge pull request #15591 from Lobachevskiy/telebaton-fix
Fix police and telebatons ignoring shields
2016-02-18 19:49:54 -06: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
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
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
duncathan salt
c8d4d58124 Merge pull request #15424 from Firecage/humansuit
Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.
2016-02-13 10:22:34 -06:00
Jordie
12b804f3e7 Merge pull request #15455 from neersighted/derp
Prevent monkies/animals from picking up intercoms
2016-02-13 17:35:55 +11:00
Jordie
3746a65f2e Merge pull request #15454 from neersighted/whoops
Fix deconstructing crates/lockers/closets
2016-02-13 17:22:49 +11:00
tkdrg
b230117223 Merge pull request #15439 from Malkevin/implants2
Tracking Implants
2016-02-13 00:17:09 -03:00
Joan Lung
24e2082086 Merge pull request #15437 from KazeEspada/backpackssatchelsdufflebagsohmy
Departmental Bags and Dufflebags.
2016-02-12 20:37:14 -05:00
Cheridan
f0aae210c7 Merge pull request #15370 from PKPenguin321/patch-16
Separates Traitor EMP Flashlights from the EMP Kit, reduces TC prices (Remake)
2016-02-12 19:13:05 -06:00
phil235
74e8bbf029 Fixes defibbed corpse not getting blind overlay despite being in crit.
Brain mobs that are beaten to death can still be inserted inside a brainless human corpse but defibbing the corpse cannot work (the brain is too damaged). On the other hand cloning that corpse will still work.
Deffibing a brainless corpse no longer gives "further attempts may be successful".
Fixes brain mob's container var not being nullified on Destroy().
2016-02-12 21:47:22 +01:00
Firecage
69569c4f81 merge conflict fix 2016-02-12 21:20:19 +02:00
AnturK
dbeec9a194 Merge pull request #15402 from octareenroon91/FIX-SORD-FIX
Refactor suicide
2016-02-12 16:49:06 +01:00
Bjorn Neergaard
0f89670107 Prevent picking up anchored items 2016-02-12 01:00:55 -06:00
Bjorn Neergaard
ad6f0cb157 Fix some poor intercom code 2016-02-12 00:11:50 -06:00
Bjorn Neergaard
8619725ab0 Prevent monkies/animals from picking up intercoms
WHY ARE THESE NOT ACTUAL MACHINES AAAAA
ANCHORED ITEMS?!

Fixes #15452
2016-02-12 00:05:18 -06:00
Bjorn Neergaard
eb228fe342 Fix deconstructing crates/lockers/closets
Fixes #15449
2016-02-12 00:03:39 -06:00
KorPhaeron
80721379b4 Three more chaplain weapons 2016-02-11 21:45:19 -06:00
phil235
a0855f2693 Brains can no longer be blinded, even when inside a MMI.
Fixes borg made from staff of change not having a brain organ in their MMI.
Removes some duplicated procs in mob.dm (probably due to incorrectly fix merge conflicts)
You can now attack brains with a weapon even when not inside a MMI (previously only when in MMI).
Fixes brain vision not being given mech sight when put inside a mech.
Removing a brain from its MMI not place the brain in your hand instead of on the ground.
Fixes built cyborgs containing two mmis.
Damaged brain from attack can't be placed inside a cyborg.
Robotized humans (called Robotize()) , such as roundstart cyborgs, now have an MMI with the human's name (instead of having a brain with a borg name, which was inconsistent with built cyborgs).
Syndiborgs bought by nukeops now have a brain with the same last name as the ops team.
Fixes Borg created with staff of change not containing a brain organ.
Fixes brain being killable when inside cyborgs. Fixes borg dropping a dead mmi brain unable to talk. Brains are now immune to environment damage and radiation.
Fixes brain being able to suicide multiple times (if put in and out of an MMI)
2016-02-12 02:04:14 +01:00
Malkevin
72184c4ae8 Balls to it, it compiles and I know I checked if it was still used last year... probably. 2016-02-12 00:43:55 +00:00
Malkevin
f234cdb919 Removed a redundant line in the tracking implant implant pad description. 2016-02-12 00:31:27 +00:00
Remie Richards
44b2344925 Merge branch 'backpackssatchelsdufflebagsohmy' of https://github.com/KazeEspada/-tg-station into fucking_kaze 2016-02-12 00:13:03 +00:00
KazeEspada
653902068e You can now select whether to start with a dufflebag. Also, you have the option to choose between generic or departmental bags.
And for all you baystation fans, I added leather satchels while I was at it.

Minor change: Atmos techs now start with engineering bags.
2016-02-11 16:48:08 -07:00
Malkevin
457b739e28 Merge branch 'master' of https://github.com/tgstation/-tg-station into implants
Conflicts:
	code/game/machinery/computer/prisoner.dm
	code/game/objects/items/weapons/implants/implant.dm
2016-02-11 23:41:57 +00:00
Malkevin
9ecaac979a Tracking implants
Removes the clunky unintuitive ID number system from tracking implants and replaces it to show the mob's name, as chemical implants already did, and the teleporter already did re: trackers
This is on both the Prisoner Management Console and the hand tracker thingamabob.

Also:
Added a line break on chemical implants on the prisoner management computer so the read out doesn't look like arse. (see here https://www.dropbox.com/s/nawkd06ztqkmkqe/Screenshot%202015-03-28%2015.16.06.png?dl=0)
Fixed the wrong path for weapons auth implants' descriptions
2016-02-11 23:20:46 +00:00
Joan Lung
35ab127543 Merge pull request #15389 from KorPhaeron/babydontfearthereaper
Fixes reaper scythe item_state
2016-02-11 12:30:01 -05:00
Firecage
c4c37d6553 Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin. 2016-02-11 09:59:23 +02:00