cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,890 Commits 61 Branches 14 Tags
29fdf73cc67a5232dd3b87f9b4cc57786ce001cb
Commit Graph

237 Commits

Author SHA1 Message Date
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
PKPenguin321
65b8ebc3fd added sprite and another fluff sound 2016-01-25 16:58:47 -08:00
PKPenguin321
42f1c5c317 adds fluff sounds 
immulshuns
this is a 1 line change commit zone
 2016-01-24 20:07:23 -08:00
PKPenguin321
dbe098da12 smooshes the two messages into one line 
one line change commit boys
 2016-01-24 18:35:32 -08:00
PKPenguin321
1f7353e3ed polishes the code 
thanks @neersighted
 2016-01-24 18:22:37 -08:00
PKPenguin321
5c39c5daf3 adds autoimplanter 
automatically implants the user with an inserted cyberimplant by using it in your hand. comes in nuke ops box of implants bundle
 2016-01-24 18:02:43 -08:00
PKPenguin321
8643aee84f adds a safety check to prevent runtimes 
if the dummy parent item somehow gets spawned and an idiot player tries to use it, this stops them from runtiming/crashing the server. written in my free time so i may have done the "holder == null" part wrong, if it breaks ill fix it in a bit.
 2016-01-22 10:33:52 -08:00
PKPenguin321
c8aa8721e8 fixes armcannon messages 
they were displaying to everybody instead of just the user because i misunderstood how messages work.
 2016-01-18 12:25:09 -08:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
tkdrg
51a28ab055 Merge pull request #14159 from somnium13/fix-in-prec 
Fixes 'in' operator precedence issues.
 2015-12-30 22:38:13 -03:00
Melichior
53db2cbcd1 Fixed 'in' precedence errors. 2015-12-29 17:16:09 -07:00
PKPenguin321
e176e7edb5 simplifies some if() statements 
thanks @duncathan
 2015-12-25 12:39:42 -08:00
PKPenguin321
3de92a2fb2 tweaks EMP act 
now deals 25 fire damage and ignites the owner with a full 20 firestacks. not an instant kill. also forcibly retracts the item should it be out at the time of EMP.
 2015-12-24 14:51:50 -08:00
PKPenguin321
ab2158d8e0 Adds Arm-Mods. 
Can be easily made with the example parent type. Includes two premade arm-mods, a mounted taser and a mounted laser.
 2015-12-23 22:54:20 -08:00
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