cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,896 Commits 61 Branches 14 Tags
a0b2b0a72113eaba91f59cdce76acbd18fdbe1c8
Commit Graph

1462 Commits

Author SHA1 Message Date
Bjorn Neergaard
cca05646e8 Auto-populate dispenser buttons, fix a couple warts 2015-12-03 15:01:22 -06:00
Bjorn Neergaard
9c997c2be0 Make remove buttons for whole beaker, not individual chems 
Also re-arrange chemistry because that crap is whack...
Also, clean up chemistry code's variables...
Death to colons!
 2015-12-03 14:33:28 -06:00
Bjorn Neergaard
e47c59c98b Add remove buttons directly to Chem Dispenser 2015-12-02 00:09:51 -05:00
Bjorn Neergaard
6aa3ed1f9c Remove an unused var from Chemistry-Machinery 2015-12-01 17:09:03 -06:00
Bjorn Neergaard
339369bc63 Remove calls to a private NanoUI proc from Chemistry-Machinery 
Also mark procs as private (because they should have been private the whole time).

Get off my lawn!
 2015-11-30 14:40:10 -06:00
duncathan salt
ad410e39d8 Merge pull request #13296 from neersighted/nanoui_checks 
Fix some NanoUI checks
 2015-11-29 18:36:18 -06:00
Bjorn Neergaard
06e5df9336 Fix NanoUI missing assignment; use two-line ifs 2015-11-29 18:20:10 -05:00
Bjorn Neergaard
8339d74056 Fix Chemistry NanoUIs 
Whoops... Forgot to revamp these...
 2015-11-28 18:09:45 -05:00
Bjorn Neergaard
5f108eef4e Merge remote-tracking branch 'tgstation/master' into nanoui_update 2015-11-27 15:31:35 -05:00
Bjorn Neergaard
b897fb6d72 Fix NanoUIs flashing, update Tanks, Solars, and Canisters 2015-11-27 15:30:18 -05:00
phil235
da0ba3659f Merge pull request #13239 from AnturK/animalbots 
Simple Animal Bots - Beepsky strikes back.
 2015-11-27 17:37:59 +01:00
Cheridan
762568255d Merge pull request #13102 from bgobandit/newmininggear 
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
 2015-11-26 18:11:26 -06:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Bjorn Neergaard
9ce7bf442e Further UI Improvements 
Finish redesign of APC and Air Alarm
 2015-11-26 12:41:16 -05:00
Bjorn Neergaard
1a44e3d851 Refactor NanoUI API 
Also update NanoUI-using code to the new API.
 2015-11-26 07:11:31 -05:00
Cheridan
ee75d5a24e Merge pull request #13131 from octareenroon91/patch-30 
Spill Oxygen / Obtain Atmosphere
 2015-11-21 23:52:34 -06:00
Remie Richards
af1922ac57 Merge pull request #13128 from Anonus/jauntblob 
Adjusts blob ability costs down slightly, gives blobs a hud
 2015-11-21 22:38:03 +00:00
octareenroon91
e2a27fb018 Add Carbon Dioxide. 2015-11-21 06:20:16 -06:00
Nerd Lord
b163bce082 Adds blob help! Blobs can now check what stuff does with a help verb! Help, it's eating me! 
Blobs now get to know what their chemical does.
Added two more buttons, for readapt chemical and storage blob.
Added hotkey for removing blobs, alt-click.
Removing a blob gives you some points back.
 2015-11-20 17:00:43 -05:00
Cheridan
3aa76f80e9 Merge pull request #13080 from PKPenguin321/patch-4 
HoG fountains now give an omnizine-like reagent instead of Doctor's Delight + Typo Fix
 2015-11-19 22:43:12 -06:00
octareenroon91
1d8dd9a3e0 Spill Oxygen / Obtain Atmosphere 
Give oxygen and nitrogen reaction_obj and reaction_turf functions, which produce their respective gases.
 2015-11-19 22:22:47 -06:00
Cheridan
4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof 
Adds subtypesof(path)
 2015-11-19 16:31:09 -06:00
bgobandit
899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear 
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
 2015-11-18 19:55:06 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
oranges
6672cb0f5d Synthflesh now correctly heals instead of kills 
As funny as that what, it's not the intent, which was instead a slight nerf to synthflesh.
 2015-11-18 16:39:05 +13:00
PKPenguin321
3d2bf3ae7b adds godblood, child of omnizine 
is identical to omnizine except that it has a 7.5x higher overdose threshold and has a new name/desc.
 2015-11-17 18:10:16 -08:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path. 
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
 2015-11-16 18:55:57 -05:00
duncathan salt
621c9e28c1 Merge pull request #13062 from optimumtact/chemchanges 
Chemistry Balancing and Additions
 2015-11-16 17:42:08 -06:00
Razharas
389f4e3779 Fixes bloodpacks 
Fixes bloodpacks
 2015-11-17 01:10:41 +03:00
Razharas
fd531118f4 Merge pull request #13037 from bgobandit/bloodlabels 
Adds the ability to label blood packs.
 2015-11-17 01:07:06 +03:00
bgobandit
4dee16a13d canusetopic for ayyranclmaos 2015-11-16 16:53:19 -05:00
bgobandit
f01fd1f942 Adds the ability to label blood packs. 2015-11-15 16:45:43 -05:00
Xhuis
13a5fdb184 Makes atropine multiplication less hideous 2015-11-14 23:18:20 -05:00
Xhuis
727eda41e8 Restores old healing values to Restorative Nanites 2015-11-14 23:15:13 -05:00
Xhuis
d51813a48f Chemistry rebalances and additions 2015-11-14 22:17:54 -05:00
duncathan salt
4fcdc7d748 Merge pull request #12950 from phil235/AIMechStunFix 
Fixes flashbanged mmis in mechs losing access to most mech functions
 2015-11-11 16:34:24 -06:00
duncathan salt
914786b0f6 Merge pull request #12921 from lordpidey/lordpidey_salgluBlood 
Saline-Glucose IV drip blood replacement.
 2015-11-11 10:46:21 -06:00
phil235
db67825974 Fixes being able to stun AI and MMI forever with flashbang, preventing them from using their mech. Brain mobs can no longer get flashed or flashbanged. Silicons are no longer affected by the sound bang of the flashbang (since they have no ears). 
Fixes a runtime with two blob reagents.
Fixes a reference not being removed when hydro tray is destroyed.
Laser pointer can no longer weaken AIs (no eyes).
 2015-11-10 22:06:54 +01:00
Mike Long
47e7046fe4 Adds the ability to use Saline-Glucose Solution as an IV drip to restore blood. It is more effective when blood is lower. 2015-11-08 11:53:07 -05:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk 
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
 2015-11-07 15:56:39 -03:00
Tkdrg
d966c37c6a Hand of God Fixes/Tweaks 
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
 2015-11-07 15:25:28 -03:00
Razharas
8e2abcb378 Merge pull request #12700 from lordpidey/lordpidey_inject 
Adds new reagent application method, INJECT.  This will hopefully pre…
 2015-11-07 04:06:34 +03:00
KorPhaeron
6f76380705 New dark blue slime reaction 2015-11-03 04:26:58 -06:00
KorPhaeron
5a781f93df Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2 2015-10-31 21:47:10 -05:00
KorPhaeron
d87803fdb4 Slime blueprints 2015-10-30 04:42:20 -05:00
Mike Long
dfbb51fb5f I did NOT mean to change this line, reverting. 2015-10-29 10:26:48 -04:00
Mike Long
158c2ba089 Fixed compile error caused by improper capitalization. 2015-10-29 10:24:55 -04:00
Mike Long
59f0c4c380 Changed a take_organ_damage call into an AdjustBruteLoss call. 2015-10-29 09:05:59 -04:00
Cheridan
7c8a4c944c Merge pull request #12696 from KorPhaeron/redunzgofastah 
Slime potion fix
 2015-10-28 15:52:39 -05:00
Razharas
9357602233 Merge pull request #12665 from tkdrg/ghost_medsechuds 
[READY] Adds a ghost on-screen HUD
 2015-10-28 05:19:19 +03:00