Commit Graph

2954 Commits

Author SHA1 Message Date
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
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
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 7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
PKPenguin321 2f71b65fe2 fixes sprite, changes prefixes
double prefixes are no more. instead, it now goes sharpened, twice-sharpened, and thrice-sharpened. there should never be an item that is sharpened more than three times, which works out because there is no word that comes after thrice (thank you so much @razharas for the code for this)
a little bit of weirdness got stuck on the sprite when i first implemented it due to a goof when i removed the transparency, it is now fixed
2016-02-17 01:09:01 -08:00
PKPenguin321 51de0406f4 adds sprites, tweaks damage values
max is now 12, down from 15
increment per block is now 4, down from 5
sprites by @newfren
2016-02-16 17:03:48 -08: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
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
PKPenguin321 3c2075bef2 addresses some feedback
sharpening now gives a message to bystanders telling what you sharpened
items with any block chance of any kind cannot be sharpened. separation between shields and weapons is absolute.
dull sharpening block -> worn out sharpening block
increments in force/throwforce now use Clamp()
adderol -> adderall
might be some other changes that i forgot but this is really the important stuff
2016-02-14 11:40:15 -08:00
PKPenguin321 8bb9680e1a adds sharpeners
two can be found in the kitchen vendor
2016-02-13 22:12:58 -08: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
tkdrg b230117223 Merge pull request #15439 from Malkevin/implants2
Tracking Implants
2016-02-13 00:17:09 -03: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
AnturK dbeec9a194 Merge pull request #15402 from octareenroon91/FIX-SORD-FIX
Refactor suicide
2016-02-12 16:49:06 +01:00
KorPhaeron 80721379b4 Three more chaplain weapons 2016-02-11 21:45:19 -06: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
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
duncathan salt c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc
Fix a number of runtimes
2016-02-10 23:50:38 -06:00
PKPenguin321 50aa10403a removes useless returns
Made on my phone so it might fuck something up, hopefully not
2016-02-10 19:42:18 -08:00
duncathan salt ca8e3c6a0a Merge pull request #15157 from LanCartwright/nomorehardsuit
Removes hardsuit from bulldog bundle
2016-02-10 21:21:42 -06:00
Cheridan eeb96cb7a5 Merge pull request #15360 from neersighted/ionsomething
Remove borg jetpack, give them ion thrusters instead
2016-02-10 18:19:13 -06:00
phil235 0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
2016-02-10 22:35:19 +01:00
octareenroon91 61796470b8 Fix suicide_act message text 2016-02-10 15:22:09 -06:00
octareenroon91 ae21d76bf8 Refactor suicide
Buff the SORD: you can now do 200 damage. Of stamina damage. To yourself. By attempting suicide.
2016-02-10 15:01:08 -06:00
KorPhaeron bbd20807b7 Indents with tabs instead of spaces 2016-02-10 10:38:51 -06:00
Bjorn Neergaard 85e80780ce Fix storage runtime
Mobs without clients can't see into storage! They have no screen!

The following runtime has occured 92 time(s).
runtime error: Cannot read null.screen
proc name: show to (/obj/item/weapon/storage/proc/show_to)
  source file: storage.dm,104
  usr: Leo Pfeifer (/mob/living/carbon/human)
  src: the backpack (/obj/item/weapon/storage/backpack)
2016-02-10 07:20:25 -06:00
KorPhaeron 3c2c923b22 Fixes scythe item_state 2016-02-10 05:06:18 -06:00
duncathan salt 9a6300e2a2 Merge pull request #15173 from KorPhaeron/holy
Allows the chaplain to choose his holy weapon theme
2016-02-09 23:42:56 -06:00
KorPhaeron 91ecb5a603 Fix for the fix 2016-02-09 23:31:34 -06:00
KorPhaeron 2566e424b3 Fixes, special effects for whip and carp 2016-02-09 23:14:50 -06:00
PKPenguin321 49066cdc72 removes EMPlight from EMP kit
separate commit because inbuilt editor cannot into editing two files in one PR
2016-02-09 16:50:17 -08:00
Bjorn Neergaard 173387eefc Remove borg jetpack, give them ion thrusters instead
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
2016-02-09 14:53:37 -06:00
tkdrg ba2e629525 Merge pull request #15286 from AnturK/bagofboom
Adds C4 bag to uplink
2016-02-08 21:39:31 -03:00