cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 15:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,643 Commits 61 Branches 14 Tags
ad8750eeb718cd00d453c8eefd4bcd0f866c29ff
Commit Graph

132 Commits

Author SHA1 Message Date
xxalpha
1a79e0eafd Fixed using the wrong robotic limbs for augmentations. 2015-05-16 12:44:53 +01:00
xxalpha
68c1158427 Fixed being able to insert NODROP items into people with cavity implant. 
Changed fix to use the right bitwise operator.
 2015-05-16 01:06:51 +01:00
Cheridan
f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Jordie
6008404738 Merge pull request #9185 from AnturK/aliens_stole_my_branch_name 
Abduction Update 2.5
 2015-05-02 23:59:48 +10:00
Jordie
840d858aa1 Merge pull request #9202 from xxalpha/igppigigppigigppigigppig 
Fixed surgery closing step not removing bleeding overlay.
 2015-05-02 23:59:06 +10:00
AnturK
a92b3b24e4 - Adds make abductor buttons on traitor panel 
- Fixes clotheless surgery
 2015-05-02 12:54:52 +02:00
phil235
752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen. 
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
 2015-04-27 23:54:28 +02:00
xxalpha
b9b741a6ae Fixed surgery closing step not removing bleeding overlay. 2015-04-27 20:27:53 +01:00
Remie Richards
95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos 
Abduction Update 2
 2015-04-26 15:38:19 +01:00
AnturK
f4a7b2dbe1 Abduction Update Two: 
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
 2015-04-26 01:30:59 +02:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
9ebbdb2fb2 span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
AnturK
6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
phil235
5f169e8e47 Remove SpeciesCanConsume() proc, replaced by iscarbon checks. 
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.

Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.

Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.

Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.

Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
 2015-04-11 22:16:42 +02:00
Cheridan
23f31693fa Merge pull request #8739 from phil235/FoodRecipes2 
A whole new bunch of foods and drinks
 2015-04-09 23:28:31 -05:00
phil235
e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
 2015-04-08 19:36:49 +02:00
xxalpha
09067eac4f Removed Reviver implant. Commented out some implant designs. 2015-04-07 07:52:07 +01:00
xxalpha
8a3e2f75a3 Better sprites for chest cyber implants. 2015-04-04 20:06:10 +01:00
xxalpha
7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
phil235
493c3e038a Splitting food.dmi into smaller files. 
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
 2015-04-03 21:59:56 +02:00
xxalpha
c1bf12345e Added ability for Medical HUDs to detect cybernetic implants. 2015-03-30 17:52:08 +01:00
xxalpha
d1f6edec01 Tweaked Close surgery step healing amount. 2015-03-30 02:28:21 +01:00
xxalpha
74d34a8ef1 Added Reviver implant. 
Added origin tech to Reviver implant.

Removed debug message.
 2015-03-30 02:26:47 +01:00
xxalpha
cc7fa8ed4b Added two more implants. "Close" surgery now heals damage. 2015-03-29 20:33:45 +01:00
phil235
1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
 2015-03-26 02:31:06 +01:00
AnturK
eadfecd552 - Makes body_egg parent for alien embryos/changeling eggs 2015-03-24 17:54:20 +01:00
phil235
ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
 2015-03-23 16:51:03 +01:00
xxalpha
920f97608a Fixed bugs. 2015-03-21 11:53:54 +00:00
xxalpha
d9921411b8 Changed anti-drop implant emp_act(). Added designs to mech fabricator. 2015-03-21 00:17:27 +00:00
xxalpha
69d4536844 Code tweaks. Designs are now in 'Medical'. 2015-03-20 22:57:52 +00:00
phil235
aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
 2015-03-20 19:32:16 +01:00
xxalpha
a9b18759f2 Fixed HUD examine features. 2015-03-19 19:41:05 +00:00
xxalpha
31de411a11 Merge remote-tracking branch 'upstream/master' into cyberimplants 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/mob_defines.dm
 2015-03-18 20:11:51 +00:00
phil235
456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
phil235
27cfbdcb2a Merge pull request #8235 from Incoming5643/you_wouldnt_download_a_car 
Fixes cavity implant surgery not respecting NODROP
 2015-03-13 12:23:44 +01:00
xxalpha
821a967986 Added Research designs for all implants. Added brain implant emp_act(). 2015-03-10 23:39:08 +00:00
xxalpha
b2baa54a08 Added anti-stun brain implant. 2015-03-10 22:28:53 +00:00
xxalpha
0f01378e7a Reworked suggested code, added brain implants, misc additions. 
Fix missing ')'.

DELETE THIS
 2015-03-09 20:39:09 +00:00
Incoming
dd2fe28678 Fixes cavity implant surgery not respecting NODROP 2015-03-08 16:35:46 -04:00
xxalpha
fc81daee07 Added Thermals and emp_act(). Tweaked some related code. 2015-03-08 20:19:02 +00:00
xxalpha
b1e340b19b Added X-ray implant, implant icon, touched up surgery. 2015-03-08 17:25:05 +00:00
xxalpha
38bae63251 Added cybernetic implants and surgery. 2015-03-06 18:52:04 +00:00
Remie Richards
5e9e6a0264 Embedded object removal added to revive() changeling revive and fleshmend 2015-02-27 17:57:22 +00:00
Remie Richards
42fe551665 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-02-19 18:16:33 +00:00
Incoming
bc2c692825 Adds a full assortment of surgery tools to the mediborg 
Mediborgs won't accidentally slice up people if they use the wrong tool
Mediborgs won't fail surgery steps
 2015-02-14 14:04:26 -05:00
Remie Richards
154a94105d Minor cleanup + Committing the surgery 2015-02-13 13:08:45 +00:00
Remie Richards
34ced43f45 Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars! 2015-02-13 12:59:02 +00:00
Xhuis
a5c9a7292f Makes butcher's cleaver a child of kitchen knife 2015-01-05 17:23:03 -05:00