cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,948 Commits 61 Branches 14 Tags
bc8c8cdcbdc68a6cf42fbb17006dd3fd9900c63c
Commit Graph

7911 Commits

Author SHA1 Message Date
Sometinyprick
bc8c8cdcbd Adds a new toy to the arcade machine 
Adds a pig mask which changes your speech to pigspeak, can be turned on
and off.
 2015-02-12 19:09:05 +00:00
hornygranny
8f1603b3e4 Merge pull request #7658 from Menshin/viruses_fix 
Viruses related fixes
 2015-02-11 12:25:57 -08:00
Menshin
4be0d7940a * Fixes exponentially growing number of diseases on iv_drip giving contaminated blood 
* Reagents now reacts when given by iv_drip()
* Viruses now correctly transfer on blood transfusion
* Some code cleaning
 2015-02-11 18:16:17 +01:00
Cheridan
0db4c09326 Merge pull request #7573 from xxalpha/schizo 
Hear the voice of the chosen deity in your head.
 2015-02-11 09:52:05 -06:00
Cheridan
7c360499be Merge pull request #7644 from TZK13/Novaflowers-and-Watermelons 
Novaflower and watermelon improvements
 2015-02-11 09:14:16 -06:00
Cheridan
ee75ba2acd Merge pull request #7639 from GunHog/RollyPollyBorgies 
Adds movement states for some cyborgs + overlay for miner jetpack
 2015-02-11 09:02:09 -06:00
Cheridan
65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2 
Defib changes
 2015-02-11 08:37:28 -06:00
Cheridan
8ec97cdaa1 Merge pull request #7632 from GunHog/ExperimentorChanges 
E.X.P.E.R.I-MENTOR changes
 2015-02-11 08:18:57 -06:00
TZK13
8ae7a739dd Lowered maximum amount of possible fire stacks even more. 2015-02-11 06:51:23 -06:00
TZK13
2e919da8ab Lowered maximum amount of possible fire stacks. 2015-02-11 06:23:44 -06:00
TheVekter
3861126c2c Reverts drunkenness changes per #7439 
Fixes a typo
Makes players drink full shot no matter how much is in glass
 2015-02-10 15:54:15 -06:00
TheVekter
5cc6371217 Merge branch 'master' of https://github.com/tgstation/-tg-station into shotglasseshowdotheywork 2015-02-10 12:06:04 -06:00
TheVekter
2b346676c1 Moved shotglasses back to drinkingglass.dm. Again. 
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
 2015-02-10 11:50:28 -06:00
Swag McYolosteinen
e971a1af29 Merge pull request #7592 from psykzz/patch-8 
remove some duplicate code
 2015-02-10 18:04:43 +01:00
Swag McYolosteinen
748341131c Merge pull request #7588 from Deantwo/ChemicalAnalyzing 
Analyze Upgrade
 2015-02-10 18:03:37 +01:00
Swag McYolosteinen
811a65f932 Merge pull request #7566 from Delimusca/chemheating 
reagent temperature enhancements
 2015-02-10 18:02:37 +01:00
Swag McYolosteinen
cfacd3bf9f Merge pull request #7589 from Menshin/reagents_warnings_fix 
Fixes warnings related to add_reagent
 2015-02-10 17:55:32 +01:00
Swag McYolosteinen
a62cbb77e5 Merge pull request #7501 from Iamgoofball/patch-28 
makes epipens more powerful at stopping losebreath
 2015-02-10 17:50:47 +01:00
Swag McYolosteinen
f130872f4e Merge pull request #7517 from RemieRichards/MovableUIElements 
Movable UI Elements!
 2015-02-10 17:50:33 +01:00
Swag McYolosteinen
bc64407000 Merge pull request #7582 from GunHog/FreePointsForHumanMiners 
Lets Silicons and Drones use the Ore Redemption Machine
 2015-02-10 17:46:03 +01:00
Swag McYolosteinen
f48f254513 Merge pull request #7611 from Incoming5643/youjelly 
Exotic Blood
 2015-02-10 17:43:44 +01:00
Swag McYolosteinen
7882b3898b Merge pull request #7631 from phil235/SinguloInvestigateLogFix 
Fix singularity investigate log
 2015-02-10 17:41:06 +01:00
Swag McYolosteinen
e5e8b27790 Merge pull request #7491 from paprka/simplyepicbuff 
Removes range from ebow bolts + price revert + bugfix
 2015-02-10 17:15:44 +01:00
TZK13
edf3364765 Novaflowers now ignite people with the amount of fire stacks applied depending on potency and you can now juice whole watermelons. 2015-02-10 06:26:03 -06:00
TheVekter
f26ceabf3a Made Toxins Special and B-52 exclusive to shot glasses. 
Tweaked drunkenness to make it less effective at lower booze levels, but moreso at higher.
Changelog.
 2015-02-10 02:21:50 -06:00
GunHog
8465c965c0 Adds movement states for some cyborgs 
Mining and Mediborgs get new movement states.
Janiborg scubbers will only move when the borg does.
Made mining borg jetpack an overlay.
 2015-02-10 00:44:38 -06:00
TheVekter
24ed9dd3e0 Wow apparently I broke the tequila sprite 2015-02-10 00:22:22 -06:00
TheVekter
f49abb5117 Adds multiple drinks to the shotglass list so they can be mixed within. 
Re-adds bottle of booze that got removed in a merge conflict a while back.
 2015-02-09 18:25:03 -06:00
TheVekter
ba18c0e925 Adds sprites and iconstates for shot glass. 2015-02-09 17:38:23 -06:00
TheVekter
e728185a49 Fixes shot glass sprite changing when something's poured in (TEMP FIX) 2015-02-09 16:55:11 -06:00
GunHog
9cad9c6745 E.X.P.E.R.I-MENTOR changes 
Meteor storm event replaced with fireballs.
EMP range reduced.
Bit of flavor stuff added to the 'coffee' reaction results.
Self-duplicating relic nerf to a max of 10 copies of itself, down from
45.
 2015-02-09 16:16:58 -06:00
phil235
3afdaabbb2 Merge pull request #7613 from Kraseo/080215 
A few bug fixes
 2015-02-09 20:35:43 +01:00
Kraseo
80191947e2 ERT now spawn with random names because cheri hates fun 2015-02-09 20:10:29 +01:00
Swag McYolosteinen
d9cf21effe Merge pull request #7586 from Menshin/r&d_console_search 
Added a search function to fabricators menus
 2015-02-09 19:19:25 +01:00
phil235
50632ce59b Fix singularity investigate log showing "X has consumed" instead of "X has been consumed by the singularity." 2015-02-09 17:29:54 +01:00
Deantwo
8c2367a3af Updated those three 
- Metabolization Rate is now displayed as units/minute.
- Name of "Overdosage" changed to "Overdose Threshold"
- Name of "Addiction" changed to "Addiction Threshold".
 2015-02-09 09:01:30 +01:00
paprka
3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
phil235
6e55479a8d Merge pull request #7583 from GunHog/AI_Stat_bugfix 
AI status screen now properly reports AFK cyborgs
 2015-02-08 21:59:06 +01:00
Swag McYolosteinen
049733d319 Merge pull request #7567 from GunHog/EjectFix 
E.X.P.E.R.I-MENTOR fixes
 2015-02-08 21:13:52 +01:00
Kraseo
08e7911f57 fixes a bunch of bugs 2015-02-08 13:27:55 +01:00
Incoming
54c40ee0ad Adds a new species var, exotic_blood, that can be used with species that don't have traditional blood so you can still draw something from them if such a thing logically makes sense. 
It's used here to allow slime jelly to be drawn from slimepeople (and the far less seen jellypeople)

In both cases slime jelly is produced from nutrition, and will always do so unless you've got either extremely low nutrition or extremely high slime jelly.

Practical effects of this:
*You can kill slimepeople in a few special ways, you can syrigne all the jelly out and once they run out of nutrition to replace it they'll stop breathing, chems that help clear toxins also screw them over BADLY in this way.
*slimepeople get free access to a semipotent toxin whenever they want provided they have a syringe on hand, but have to manage their nutrition if they rely on it.
*Other chems can be syringed wholesale out of slimepeople as well provided they haven't been metabolized yet.
 2015-02-08 03:18:50 -05:00
Deantwo
0e762dd720 Metabolization and colored text 
- Added "Metabolization rate" to the analyze screen.
- Changed the text under the color to the actual hex code.
- Changed the font of the text under the color to "Lucida Console", just
so it is always the same length.
 2015-02-08 00:30:11 +01:00
Cheridan
5610b46a0f Merge pull request #7528 from paprka/clothessec 
Some clothing changes
 2015-02-07 17:00:36 -06:00
Matt Smith
b2ad540f78 needed the key, 
I dont like this whole function and am kinda feeling to kill it all.
 2015-02-07 20:52:45 +00:00
Matt Smith
1246f14dd1 incorrect proc name 2015-02-07 20:37:49 +00:00
Remie Richards
c4af140159 Merge pull request #7511 from paprka/cool 
adds a skeleton ghost for byond supporters
 2015-02-07 16:48:52 +00:00
Matt Smith
ae0b1cf606 remove some duplicate code 2015-02-07 15:52:11 +00:00
Menshin
e154d69b0b * Fixes warnings related to add_reagent when trying to inject blood containing reagents 
* Fixes sleepers showing reagent id instead of name
* Some formatting adjustments to the mass spectrometer output

* Make the "Saline-Glucose Solution" name fit in one line.
 2015-02-07 16:32:25 +01:00
Cheridan
6bfbbaa65b Merge pull request #7390 from Steelpoint/SecBorgDisabler 
[BALANCE|NERF] Replace's Sec Borg's AdvTaser with a Disabler
 2015-02-07 08:46:57 -06:00
Deantwo
89a534203e Analyze Upgrade 
ChemMaster changes:
- Analyze screen now displays more information about the reagent;
reagent_state, color, overdose_threshold, and addiction_threshold.
- Moved the href_list["main"] up to below href_list["analyze"].
- Analyze href changed to send a pointer to the target reagent.
- Minor change to tranfering between beaker and buffer.
 2015-02-07 10:07:06 +01:00