cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 01:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,531 Commits 61 Branches 14 Tags
8cbfed09a5ffd7e10b60f4e73b424eccc5a42a4d
Commit Graph

185 Commits

Author SHA1 Message Date
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
Xhuis
d1ceb296be Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall 2015-08-03 16:37:06 -04:00
Xhuis
4cefd114c5 Shadowling update 3 2015-08-03 16:35:42 -04:00
c0
667d5e75c3 Transferred body eggs to new organs system 2015-08-03 23:24:17 +03:00
PatchouliKnowledge
056c018b80 Preventative appendectomy prevents appendicitis 2015-08-03 15:13:00 +03:00
c0
600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
c0
93b72c863a Added progress bars to surgeries 2015-08-02 14:15:06 +03:00
c0
8e0e6f3191 Tweaks and fixes 2015-08-02 00:37:29 +03:00
c0
04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
xxalpha
fc4afd763d Revert "Revert "Removed anti-drop implant from NukeOps uplink."" 2015-07-27 18:47:56 +01:00
Thunder12345
84ef074312 Revert "Removed anti-drop implant from NukeOps uplink." 2015-07-27 11:10:32 +01:00
xxalpha
82727498b3 Removed anti-drop implant from NukeOps uplink. 2015-07-24 08:49:54 +01:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires. 
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
 2015-07-10 00:18:35 +02:00
Ikarrus
5e50b2b982 Update and Changelog 
Lizard names are now "name1-name2"
 2015-07-05 22:20:00 -06:00
Ikarrus
b0cfaf401f Random Names for Lizards 
Lizards now have their own list of names to pull from when randomizing their names.
 2015-07-05 18:35:56 -06:00
xxalpha
4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium 
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
 2015-07-02 18:49:41 +01:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up 
cant wake up

go to sleep debug
 2015-07-01 03:34:47 +01:00
Ikarrus
1e30fc4b6c Gang Update: Implants Edition 
- Multiple gang leaders are spawned at round start, the number which depends on server population
- Only one boss per gang, the rest are lieutenants
- Only the gang boss can recall the shuttle
- Gangsters can no longer be promoted mid-game.
- Security can once again deconvert gangsters with loyalty implants
  - A message is shown if the deconversion destroys the implant in the process

- Added an Implant Breaker item to the gangtool as a purchasable item for 10 influence each
  - They are a one-use item that destroys all implants in the target, including loyalty implants
  - They will also attempt to recruit the target before destroying itself
  - As this is an implanter it requires the target to remain still for a few seconds to administer it
- Implanters no longer work if the target is wearing headgear. Remove them first

- Added help text whenever you buy certain items from the gangtool
- Spare gangtools now cost 30 influence for everyone
  - They no longer give you a free pen
- Increases domination limit back to 3
- Purchased outfits are automatically equipped in your hand, if possible
- Gang boss has a 3 minute window at round start to select an outfit style. If he doesn't select one, the his lieutenants may pick one. No gang outfits can be created without a style picked first.
  - This is just to give the gang boss the first opportunity to pick an outfit style for his gang
- You can now see how many outfits your gangtool has in stock
- Outfits are no longer used up if you cancel the style selection prompt
- Loyalty implant destruction message has been moved to its Destroy()
 2015-06-29 23:50:06 -06:00
phil235
2e61607d3f Merge pull request #10105 from xxalpha/chief 
Cleaned some clothing flags.
 2015-06-26 19:03:13 +02:00
xxalpha
305daf5d92 Fixed reviver implant EMP resetting cooldown time. 2015-06-24 15:36:40 +01:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
 2015-06-23 12:54:26 -07:00
xxalpha
16504ef0cf Cleaned some clothing flags. Ported turf/Entered optimization from vg. 2015-06-23 01:52:14 +01:00
Razharas
e6b738734a Merge pull request #8876 from xxalpha/fixfixfix 
Cyber Implants + (Pt.2)
 2015-06-21 22:12:17 +03:00
phil235
aa5541070c Merge pull request #10082 from xxalpha/bass 
Fixed not being able to insert a brain into an MMI.
 2015-06-21 19:33:45 +02:00
xxalpha
609d65af58 Fixed surgical step 'saw' not working properly on non humans. 
better
 2015-06-21 18:26:00 +01:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass 
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
 2015-06-18 15:50:35 +02:00
phil235
2e7ddc1f45 Merge pull request #9053 from MrPerson/screen_alert_2 
More screen alerts
 2015-06-15 01:00:20 +02:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Iamgoofball
f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
MrPerson
9dc713ba9c Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2 
Conflicts:
	code/_onclick/hud/alert.dm
	code/game/objects/items.dm
	code/modules/mob/living/carbon/human/human.dm
	icons/mob/screen_alert.dmi
 2015-06-09 03:23:18 -07:00
Cheridan
ed8dffca94 Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome 
Bugfix: Witticism depleted editon
 2015-06-03 09:49:51 -05:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Jordie0608
03ab08112f animated foam pistol shoots proper darts, no generic surgery, augmented eyesight gives nightvision and reagents in admincookie 2015-05-31 18:25:34 +10:00
xxalpha
662af7174f Merge remote-tracking branch 'upstream/master' into fixfixfix 
Conflicts:
	icons/obj/storage.dmi
 2015-05-29 21:45:18 +01:00
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
xxalpha
f0351e1890 Tweaked uplink prices. 
Undo X-ray requirement change.
 2015-05-15 21:54:08 +01:00