bgobandit
a2241e0f6f
Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag
...
Conflicts:
code/modules/client/preferences.dm
icons/mob/head.dmi
tgstation.dme
2015-12-17 20:12:32 -05:00
oranges
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
KorPhaeron
beef2e88a4
Removes old proc
2015-12-16 16:21:32 -06:00
bgobandit
112dc6c6f6
adds feature inheritance, fixes recipe
2015-12-12 02:40:23 -05:00
bgobandit
5fa93e0e55
Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats.
2015-12-11 19:03:09 -05:00
bgobandit
83fd94a507
fixes honkworthy typo, ups chainsaw success chance, adds color inheritance
2015-12-10 19:49:46 -05:00
bgobandit
49d54f48f7
Adds the severing of lizard tails.
2015-12-10 18:58:37 -05:00
KorPhaeron
3b53d8dc45
Removes broken code
2015-12-09 13:38:42 -06:00
PKPenguin321
d03a1b5083
adds chainsaws to ghetto sawing tools
...
adds chainsaws and mounted chainsaws as ghetto analogues for generic sawing steps
2015-11-23 22:33:13 -08:00
phil235
5e43d2b570
Merge pull request #12924 from Firecage/Optable
...
Changes the operating table to be an actual table.
2015-11-11 17:31:38 +01:00
duncathan salt
b0c2e3e9c8
Merge pull request #12793 from PKPenguin321/patch-2
...
Adds surgery to remove surgically attached chainsaws
2015-11-10 23:25:51 -06:00
Firecage
b2937bf315
Changes the operating table to be an actual table.
2015-11-08 22:09:35 +02:00
Razharas
5b1a2836fa
Merge pull request #12772 from Xhuis/shadowling_update_5
...
Shadowling Update V
2015-11-07 06:11:39 +03:00
Cheridan
55e138c77d
Merge pull request #12817 from Incoming5643/so_long_dental_plan
...
Dental implant fixes
2015-11-04 11:28:30 -06:00
Incoming
30e8a39869
Checks work better when you actually check them.
...
Adds some low level logging for implanted pill use. If you want specific logging for when certain chemicals come into play, that's more a goofchem problem.
Fixes some grammer while I'm here
2015-11-02 01:12:48 -05:00
PKPenguin321
d2f3b0fd4a
fixes critical bugs
...
finishes -> finshes
arms -> arm
sorry for clogging commits :(
2015-11-01 01:23:14 -08:00
PKPenguin321
cb55c84c35
changes messages to be more clear
...
I forgot to change the messages to make them more clear, they were previously "checking for a chainsaw" since the way i checked for chainsaws was much more hacky in the original version of this code
2015-11-01 01:18:44 -08:00
PKPenguin321
a9cb60d690
adds removing chainsaws + indentation cleanup
...
changes indenting on chainsaw augmentation from a bunch of spaces to nice and neat tabs
adds a surgery to remove surgically attached chainsaws
2015-11-01 01:58:34 -07:00
Xhuis
3c20526900
Re-adds dethralling surgery and speeds up enthralling
2015-11-01 01:39:01 -04:00
Xhuis
55021fc27d
Conflicts 2/2
2015-10-31 11:32:12 -04:00
Xhuis
f2291a1194
Shadowling update 5
2015-10-31 11:30:29 -04:00
Razharas
381f3bb8ad
Merge pull request #12718 from Incoming5643/so_long_dental_plan
...
Adds dental implant surgery
2015-10-31 15:05:28 +03:00
Incoming
b36e26d7d2
prerequisite "dumb mistakes" follow up pull
2015-10-28 17:33:16 -04:00
Incoming
7dfdb50919
Adds dental implant surgery.
...
While targeting the mouth drill a hole in a tooth then stick a pill in there for hands free later use.
2015-10-28 17:30:28 -04:00
PKPenguin321
fe8d0e58cd
Adds a surgery to attach a chainsaw to your hand
...
Once added you cannot remove the chainsaw and the hand will be forever
used
2015-10-28 12:16:58 +13:00
Rui Neves Carvalho
80e7024f6c
Fixes Sec Hud wanted status not being updated when changing identity. Original PR by Astralenigma, New one by phil235.
2015-10-19 21:22:05 +02:00
phil235
9c79257aab
Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
...
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
francinum
f6bcb5359f
Adds a critical S
...
[user] mend the incision in [target]'s [parse_zone(target_zone)].
[user] mends the incision in [target]'s [parse_zone(target_zone)].
2015-10-08 22:19:11 -04:00
c0
feeb9ff7d2
Organs update 3
2015-09-25 22:26:15 +03:00
xxalpha
deb60ae309
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
Xhuis
af31d566b2
Syndicate medical cyborgs
2015-09-17 20:02:48 -04:00
phil235
1cf98260bb
Merge pull request #11742 from Aranclanos/chestAugs
...
fixes chest augmentations
2015-09-14 20:28:27 +02:00
Aranclanos
cb6bb99318
Readds the chest augmentation organ to the augmentation surgery, humans won't walk around chestless anymore.
2015-09-12 15:07:29 -03:00
bear1ake
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
Razharas
9d6ce85e9a
Merge pull request #11414 from Xhuis/shadowling_update_4
...
Shadowling Update IV
2015-09-01 17:19:07 +03:00
Razharas
bfbe4e997e
Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
...
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
duncathan
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
Xhuis
df9e581df0
Shadowling update 4
2015-08-27 19:29:33 -04:00
bgobandit
ecfb129051
Adds three new ghetto surgery possibilities.
2015-08-23 18:58:24 -04:00
Remie Richards
3891e67d8d
Merge pull request #11162 from Core0verload/rnd-implants
...
RnD update
2015-08-18 20:20:12 +01:00
c0
23011e0906
changelog
2015-08-15 13:22:02 +03:00
c0
a06271733e
Fixes and changes
2015-08-12 20:31:35 +03:00
c0
d6e69dabfe
Some tweaks & changelog
2015-08-06 10:28:01 +03:00
c0
691f6fb66d
Surgery & Organs Rework: Phase 2
2015-08-06 09:56:54 +03:00
Cheridan
cd2faf72b5
Merge pull request #10988 from PatchouliKnowledge/Appendifixis
...
Fixes appendicitis magically self-curing
2015-08-05 05:38:46 -05:00
oranges
5c3a311dd4
Merge remote-tracking branch 'upstream/master' into Appendifixis
...
Conflicts:
code/modules/surgery/appendectomy.dm
2015-08-05 13:58:21 +12:00
PatchouliKnowledge
de8c10e6c7
Merge conflicts pls go
2015-08-05 01:08:52 +03:00
Xhuis
72a5c7bf5e
Updates surgery
2015-08-04 15:11:53 -04:00
Xhuis
e370d89ca3
Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall
2015-08-04 14:48:35 -04:00
c0
88f2073a5e
Abductor glands are organs now
2015-08-04 01:46:32 +03:00
