cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 18:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

143 Commits

Author SHA1 Message Date
tkdrg
96d8652ec4 Merge pull request #15885 from phil235/ReagentMobUpdateFix2 
Health update from reagent metabolization now only happens once. Part 2
 2016-03-04 22:18:39 -03:00
Cheridan
519a517206 Merge pull request #15901 from ChangelingRain/chemfixes 
Fixes and tweaks blob chemicals
 2016-03-04 16:08:21 -06:00
Nerd Lord
eaf0c3443c don't code when nauseated for like a month kids 2016-03-03 19:59:58 -05:00
Nerd Lord
594322b2e6 oh wow jeez whoops 2016-03-03 19:30:38 -05:00
Nerd Lord
12d0d82cd6 Synch mesh won't split damage to cores or nodes 2016-03-03 19:17:24 -05:00
Nerd Lord
2b405d7db1 Tweaks blob chems slightly 2016-03-03 10:41:50 -05:00
Cheridan
aa9196a725 Merge pull request #15880 from Core0verload/plantrefactor1 
Plant Refactor: Revenge of the Grown
 2016-03-03 00:16:34 -06:00
phil235
e5c3011148 Fixes incorrect argument given to Weaken() and adjustWeakened() in some cases. 2016-03-02 20:04:37 +01:00
phil235
c07a48a84d Moved changeling adrenaline and shadowling blindness smoke reagent to the proper reagent files. 
Fixes these two reagents calling mob update procs when they shouldn't.
 2016-03-02 19:55:55 +01:00
Cheridan
ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo 
Remake of #15690. Replaces newcult with oldcult.
 2016-03-01 22:37:58 -06:00
c0
0e1ae09e92 Plant Refactor: Revenge of the Grown 2016-03-02 07:30:06 +03:00
tkdrg
ef1f9845dc Merge pull request #15412 from LanCartwright/toxinvirology 
New virology chems. Makes virus food actually useful. Adds uranium to virology uses.
 2016-02-29 23:41:28 -03:00
Akke
97f2a423de fixes other_reagents.dm to be children of their original reagent. 2016-03-01 00:03:13 +00:00
Akke
2c98a52c83 dumbest mistake of my life result_amount fix 2016-02-29 21:58:58 +00:00
Cheridan
946b89b5f2 Merge pull request #15791 from phil235/ReagentStatUpdateFix 
Health update from reagent metabolization now only happens once.
 2016-02-29 15:07:23 -06:00
Akke
018bc20ce0 Adds virology reagents to actual reagents/chemistry/reagents/other_reagents.dm 2016-02-29 20:48:50 +00:00
Akke
e22ddb5e35 fixes some bugs 2016-02-29 00:07:51 +00:00
Nerd Lord
ccf02706ea lighten color 2016-02-27 22:07:30 -05:00
Nerd Lord
6002f1467a Adds blobbernaut production animation. 
Spores now fly properly(and zombies don't)
Added Adaptive Nexuses, which does medium brute damage and kills unconscious targets, reaping points for the overmind.
 2016-02-27 22:00:49 -05:00
Nerd Lord
8dbea9021c only the living 2016-02-27 17:00:24 -05:00
Nerd Lord
544412a80a shortdesc for flammable goo 2016-02-27 14:11:04 -05:00
phil235
0001dea5f0 || not | 2016-02-27 16:24:10 +01:00
phil235
069759f262 When reagents are metabolized, we only call update procs like updatehealth() or update_canmove(), once instead of once for each reagent effect that usually calls an update. 
This fixes falling and getting up instantly every tick when you have a reagent weakening you and another healing the weaken effect.
 2016-02-27 15:46:30 +01:00
Shadowlight213
642321b5cd Removes newcult and readds oldcult 2016-02-27 00:53:14 -08:00
Nerd Lord
cee1eb03c8 figures, too complex 2016-02-26 23:45:23 -05:00
Nerd Lord
2e2794c959 Adds five new blob chemicals. 
Draining Spikes, which is reddish pink, does medium brute damage, and drains blood from targets.
Shifting Materia, which is tan, does medium brute damage, and shifts position when attacked.
Flammable Goo, which is reddish orange, does low burn and toxin damage, and when hit with burn damage, emits a burst of flame. It takes more damage from burn, though.
Poisonous Strands, which is lavender and does burn, fire, and toxin damage over a few seconds, instead of instantly.
Bluespace Dust, which is bright green, does low toxin damage, irradiates, and may teleport targets.

Other changes;
Replicating Foam has a lower chance to expand when hit
Penetrating Spines is now purple instead of sea green.
 2016-02-26 23:00:43 -05:00
Akke
b35db55305 adds new recipes/others.dm 2016-02-24 23:28:38 +00:00
KorPhaeron
d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06:00
duncathan salt
6458b524a0 Merge pull request #15615 from ChangelingRain/nottheblob 
Blobbernauts and blob spores are now immune to blob chemicals
 2016-02-19 15:51:41 -06:00
Cheridan
24d17307a3 Merge pull request #15587 from phil235/EffectMorphineFix 
Fixes certain reagent making you sleep/be stunned/blind for just a split second every tick
 2016-02-19 11:18:50 -06:00
Nerd Lord
59d342af3a Blobbernauts and blob spores now have healing effects when being healed by the blob. 
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
 2016-02-18 17:11:59 -05:00
phil235
e3ba907c58 Fixes certain reagent making you sleep/be stunned/blind for just a split second every time life() is called. 2016-02-17 21:20:39 +01:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily: 
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
 2016-02-16 23:27:08 +01:00
Cheridan
5f089e6ac1 Merge pull request #15483 from ChangelingRain/blobtweaking 
Blobs can now expand onto lattices and catwalks
 2016-02-13 19:58:09 -06:00
Nerd Lord
ea67e1aa0d Blobbernauts can now speak to other blobbernauts and overminds with :b 
Blobbernauts and blob spores now have ask, exclaim, and yell speak emotes.
Blobbernauts and blob spores have a randomly-generated number assigned to their names.
 2016-02-13 16:47:25 -05:00
Nerd Lord
18bbc4758a Blob Sorium and Dark Matter properly reduce range based on bio protection. 
Updates blob tips.
Blobs now consume walls that are on their tile.
Added a space between blob follow link and message.
 2016-02-12 20:07:44 -05:00
duncathan salt
759a95f974 Merge pull request #15372 from optimumtact/patch-8 
Don't sleep life for 30 ticks with slimetoxin
 2016-02-10 22:51:41 -06:00
Akke
d5416b8661 Adds toxin to virology use. 2016-02-11 00:18:44 +00:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
 2016-02-10 22:35:19 +01:00
oranges
f14592f69d Don't sleep life for 30 ticks with slimetoxin 
This could cause a single users life to delay up to 3 seconds
 2016-02-10 14:14:43 +13:00
AnturK
03890d2ea4 Merge pull request #15250 from ChangelingRain/blobtooweak 
Adds five new blob chemicals and some blob tweaks
 2016-02-09 18:04:55 +01:00
Nerd Lord
6483723c50 Removes unneeded if(M)s. 
At least, ones that I *hope* are unneeded.
 2016-02-08 22:10:11 -05:00
phil235
83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping) 
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
 2016-02-07 18:50:18 +01:00
Nerd Lord
75bb04d35a less 4-hit crits okay 2016-02-06 20:32:49 -05:00
Nerd Lord
a2b05e14ef Updates Penetrating Spines color, Reactive Gelatin damage. 2016-02-06 19:48:51 -05:00
Nerd Lord
c28c1203cd Adds five new blob chemicals. 
Blob mobs now heal for 2.5% of their maxhealth when blob_act()ed, basically whenever they're on the blob
Blob expansion no longer has a chance to fail inversely proportional with the expanding blob's health.
Blobbernauts have slight color differences.
 2016-02-06 19:32:30 -05:00
phil235
99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/modules/reagents/chemistry/holder.dm
 2016-02-06 20:38:16 +01:00
tkdrg
4e34ca775e Merge pull request #15219 from neersighted/reagents_aaaaaaa 
Speed reagent reaction code
 2016-02-06 16:15:50 -03:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
 2016-02-06 15:42:13 +01:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00