cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,597 Commits 61 Branches 14 Tags
4e84fb2eeff70cd10e9ccfcd6042889d0ea1653b
Commit Graph

683 Commits

Author SHA1 Message Date
Remie Richards
3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf 
Adds dirt overlays for walking on simulated turfs
 2015-01-04 02:22:50 +00:00
tkdrg
bbe34b2a53 Merge pull request #6186 from Dorsisdwarf/Chemoverlaysreal 
Chemdispenser Overlays [feature]
 2015-01-03 02:26:10 -03:00
tkdrg
84e3eaaf16 Merge pull request #6676 from Jordie0608/beeverycarefulwiththese 
Adds bee and butterfly disease to virus pack
 2015-01-02 02:33:23 -03:00
paprka
8661025135 Moves the typecast under the ischeck for space cleaner 2014-12-31 17:25:23 -08:00
paprka
9de9f4b3f8 istypes the space cleaner dirt clean 2014-12-31 17:21:36 -08:00
paprka
d048dd87bd Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf 2014-12-31 17:14:03 -08:00
Jordie0608
fd71b7cbb2 Adds bee and butterfly disease to virus pack 2014-12-30 14:44:30 +11:00
Razharas
f7e6552e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-29 17:05:20 +03:00
tkdrg
48374658a8 Merge pull request #6638 from paprka/beamexplody 
Fixes disabler beams exploding fuel tanks
 2014-12-29 10:37:43 -03:00
Razharas
418e3a0613 General cleanup 
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
 2014-12-29 11:36:01 +03:00
Razharas
4c3f83d085 This shall fix the hunger system 
I really really hope it does
 2014-12-28 21:51:28 +03:00
paprka
88a0ee34f4 fixes disabler beams exploding fuel tanks 2014-12-28 03:15:26 -08:00
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
 2014-12-28 11:20:15 +03:00
paprka
8535145401 Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf 
Conflicts:
	code/game/turfs/simulated/floor.dm
 2014-12-27 21:54:53 -08:00
paprka
9b7aa9ca82 adds a check for gravity and ignored turfs 2014-12-27 21:43:48 -08:00
tkdrg
7f7fad7ac9 Merge pull request #6586 from phil235/ResonatorTableFix 
Fixes the resonator being activated when placed on a table/closet/storage
 2014-12-27 15:06:36 -03:00
tkdrg
1846489593 Merge pull request #6589 from phil235/SiliconPunchMsgFix 
Fixes message typos
 2014-12-27 11:48:54 -03:00
Swag McYolosteinen
7ee2317ec3 Merge pull request #6207 from phil235/RecursiveHearVisibleMessage 
Mob inside something can now see visible_message()'s
 2014-12-27 13:20:50 +01:00
Cheridan
cededeaa8e Merge pull request #6498 from as334/MobReactions 
Allows chemical reactions inside mobs
 2014-12-27 01:20:18 -06:00
as334
8a9d7b12c4 Change the spacing.-For Cheridan 2014-12-27 02:09:07 -05:00
as334
a3e70b3cf2 Prevents certain chemical reactions occuring in mobs. 2014-12-27 01:38:31 -05:00
phil235
8a56892892 Fixes message typos in silicon punch message, mecha construction description, message when taking blood sample. 2014-12-26 12:13:54 +01:00
phil235
b60fa8b57b Fixes the resonator being activated when placed on a table/closet/storage. 
Also fixes beaker being splashed when put inside the vault's safe.
 2014-12-24 20:07:49 +01:00
Ergovisavi
a9d7266ca2 Merge branch 'master' of https://github.com/tgstation/-tg-station into muh_mobs 2014-12-22 19:55:04 -08:00
Razharas
9a27fe7c8d Conflict fix 
Yeah makes it all work
 2014-12-21 06:12:33 +03:00
phil235
c667feeb61 Merge branch 'master' of https://github.com/tgstation/-tg-station into RecursiveHearVisibleMessage 
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
 2014-12-19 15:23:16 +01:00
paprka
ef189dc9d4 adds dirt overlays for walking on turfs 2014-12-16 22:12:14 -08:00
Razharas
b12472e0bb Made shit compilable, probably broke new hunger 
Whoever made it: tough luck bro
 2014-12-16 03:12:58 +03:00
Razharas
f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
 2014-12-16 02:52:08 +03:00
phil235
ff36952344 Fixes not being able to remove used slime extract from the slime extract smartfridge in xenobio. 2014-12-15 01:30:18 +01:00
phil235
f87da5939a Making nutrition level values into defines. 
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
 2014-12-13 17:15:35 +01:00
Razharas
8d110ee496 Tiny clean up, still lots of work to do 
Only compiletested, these changes were never tested in the game yet
 2014-12-12 23:57:11 +03:00
phil235
0e94a86e55 Another typo 2014-12-12 15:50:13 +01:00
phil235
70dca65c95 Splitting the huge Chemistry-Reagents.dm into smaller files for better readability. 2014-12-12 14:30:44 +01:00
phil235
f9dff2f626 Balancing nutrition and fixing some nutrition stuff that I had missed. 2014-12-12 13:59:31 +01:00
Razharas
0921aa201f Added datum mutations 
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
 2014-12-12 04:48:11 +03:00
phil235
7bd9b86652 Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm . 
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
 2014-12-11 20:46:27 +01:00
Ergovisavi
c9700d6b12 -Attempting to make mobs less laggy in the event many hostile mobs are spawned near each other by narrowing their searching by default with a new var, removes ishuman check 
-Humans create a unique faction on creation, and transfer it via cloning/replica podding etc
-Created slime faction, gives slime and slime men that faction
-Simultaneous goliath tentacling will no longer stack, and goliaths now have a "tell" when they're about to strike
 2014-12-09 02:05:34 -08:00
Razharas
cc8c221fab Merge pull request #6257 from as334/Slimes 
Add's more stuff for Xenobiology and slimes
 2014-12-09 06:44:12 +03:00
Swag McYolosteinen
bff2e62a0f Merge pull request #6175 from Razharas/ExActFix 
Fixes ex_act() destroying too much shit
 2014-12-08 08:03:35 +01:00
as334
7b05f3962b Fixes chem reactions 2014-12-07 16:42:37 -05:00
as334
f21e9d0a6b Adds neat slime stuff 2014-12-07 16:20:31 -05:00
Swag McYolosteinen
609807df75 Merge pull request #6199 from Ergovisavi/less_terrible_human_plants 
Pod Cloning changes
 2014-12-07 17:34:54 +01:00
Ergovisavi
e581a3ff8f Commiting changelog for new replica pod behavior 2014-12-07 05:13:54 -08:00
phil235
be1b02059f Merge branch 'master' of https://github.com/tgstation/-tg-station into RecursiveHearVisibleMessage 
Conflicts:
	code/game/machinery/doors/windowdoor.dm
	code/game/mecha/mecha.dm
	code/game/objects/structures.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
 2014-12-05 22:02:01 +01:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
phil235
d545eb7f9f Visible_message() now uses recursive_hear_check so mob inside something can see those messages. Fixes being able to see visible_message w/o seeing the src of it (happened when the src could see us but not the other way around), you no longer see visible_message from mobs inside closets for example. 
Fixes pAI being deaf.
Removing some no longer needed occupant_message() in mecha code.
Fixed some typos and span class here and there.
 2014-12-04 01:08:04 +01:00
hornygranny
bc9d9f6d58 Merge pull request #6105 from RemieRichards/AcidProtectionUpdate 
Acid protection update
 2014-12-03 10:28:47 -08:00
Ergovisavi
ff5b845371 Some changes to Blood and Replica Pods, adds more vars for allowing Replica pods to clone without an intact body, sets replica production to 1 for faster cloning, makes you a plantman/woman 100% of the time 2014-12-03 06:29:49 -08:00