cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,850 Commits 61 Branches 14 Tags
96fd665676ebae95da351bbefdf5f84f78fcfbf3
Commit Graph

6556 Commits

Author SHA1 Message Date
KorPhaeron
31dea914a2 Merge pull request #16304 from ChangelingRain/vinelayer 
Space vine mobs now layer under ghosts
 2016-03-25 20:24:56 -05:00
KorPhaeron
095bede7ed Merge pull request #16334 from ChangelingRain/parasitic 
Adds assassin holoparasites
 2016-03-25 19:24:28 -05:00
Nerd Lord
9bb05224ca there are better ways 2016-03-25 20:15:21 -04:00
Nerd Lord
15714b8a74 oh right the tiny paper thing 2016-03-25 12:04:50 -04:00
Nerd Lord
06da199b43 briefly cannot recall; changed damage to 50/13 2016-03-24 21:06:52 -04:00
Nerd Lord
9595c5e393 >robustin has a good idea 2016-03-24 16:46:30 -04:00
AnturK
209884a516 Merge pull request #16262 from RemieRichards/BEES_glorious_BEES 
Reagent Bees Revengenace
 2016-03-24 21:45:31 +01:00
Nerd Lord
b37af6f177 that doesn't even work 2016-03-24 14:58:47 -04:00
Nerd Lord
9b8c469f3f this really needs to be a var 2016-03-24 14:42:14 -04:00
Nerd Lord
e4f6a24da3 Guardians no longer damage other guardians that share a summoner. 2016-03-24 14:38:21 -04:00
phil235
7c2203857c Merge pull request #16147 from Xhuis/bacchus_approves 
Alcohol Refactor (Merge-Ready)
 2016-03-24 19:05:56 +01:00
Nerd Lord
c99d33ece0 more damage because it takes full damage 2016-03-24 12:17:07 -04:00
AnturK
f42928fb4e Merge pull request #16077 from Buggy123/floorbotbuff 
Buffs Floorbots
 2016-03-24 17:16:12 +01:00
Nerd Lord
5dea8ebca1 Adds assassin holoparasites 
Assassin holoparasites can go invisible, causing their next attack to do massive damage and ignore armor.
The stealth will be broken by attacking or taking damage.
 2016-03-24 12:08:09 -04:00
duncathan salt
63aa7358f4 Merge pull request #16291 from ChangelingRain/holobuff 
Buffs lightning holoparasite to not be total shit
 2016-03-23 21:13:17 -06:00
Nerd Lord
4ab87e60cf tis all 2016-03-23 16:38:04 -04:00
Nerd Lord
e2b63da3a6 generic typepath! 2016-03-23 16:21:30 -04:00
Remie Richards
b9a2c7fdfe Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES 
Conflicts:
	icons/mob/head.dmi
 2016-03-23 15:41:58 +00:00
Remie Richards
56e5a3cea3 Here come the nerfs, all dressed in your tears~ 
* Plant Health gained per pollination is now half the bees health (down from all the bees health, which was only 10 max anyway)
* Pests are now only reduced in 33% of pollinations (33% chance to reduce pests, down from 100%)
* Yieldmod is now only increased 5% of the time (down from 100%)
* Yieldmod is now a new variable, innate_yieldmod on plants, this is so having bees and THEN using chemicals on the plants doesn't magically undo the bee's work, it is added onto the yield mod of the tray.
* To make up for the above, there is now a 50% chance per pollination (up from 0%) for the potency (how many reagents the plant gets) to go up by 1, this isn't much, but 50% of the time adds up
 2016-03-23 15:36:20 +00:00
Nerd Lord
f6406fa1fb You can now click through space vines to attack mobs/grab items underneath them 
Vine/Vine Mob layering adjusted to be under ghosts.
 2016-03-23 11:19:29 -04:00
Cheridan
588d83e1c2 Merge pull request #16270 from lzimann/patch-1 
Changes the layer of flower bud and venus human trap
 2016-03-23 00:15:50 -05:00
Cheridan
80718dc883 Merge pull request #16277 from Incoming5643/Runtime_PLEASE 
Hopefully resolves Runtime catastrophe
 2016-03-22 23:23:11 -05:00
Nerd Lord
d6ed7188e2 dreams really do die 2016-03-22 16:09:50 -04:00
Nerd Lord
905a72069b Buffs lightning holoparasite to not be total shit 
Adds two new, admin-only guardian types
 2016-03-22 16:07:37 -04:00
AnturK
0252a01115 Merge pull request #16181 from Jordie0608/goodcodingpracticesarelikeusefulcommentsthisfilehasneither 
Cleanup of polling code
 2016-03-22 19:25:56 +01:00
KorPhaeron
c5746e84ae Merge pull request #16267 from CPTANT/Staminafixnew 
fixes #15316 - Stamina resistance being applied twice
 2016-03-22 13:03:14 -05:00
Incoming
b4f5e55d72 Runtime's extended family doesn't spawn until the round is just about to start. 
In theory this should close out the window during which Runtime would furiously breed with any other cat she can see on her tile.

In addition this lowers the chance of Not!Espeon Runtime to 5% per round. I asked Kor if I could do this and he was/is fine with it. Also added a 100 cat cap on each type of spawned cat. HOPEFULLY IT'S NEVER NEEDED.
 2016-03-22 00:28:03 -04:00
Nerd Lord
4865ca6a7e a donk 2016-03-21 18:08:05 -04:00
Nerd Lord
f062e54887 too close must conflict 2016-03-21 17:30:39 -04:00
Leo
0d96d0feab Changes the layer of flower bud and venus human trap 
Fixed #16253

Now they are above the space vine and you can actually see them.
 2016-03-21 17:44:21 -03:00
Cheridan
6b65866444 Merge pull request #16210 from ChangelingRain/lightningmaster 
Adds Lightning Holoparasites
 2016-03-21 15:34:59 -05:00
Remie Richards
ed8ca553b4 Fixes, Improvements, Feedback - Wave 1 2016-03-21 18:05:28 +00:00
CPTANT
fbbd5b0259 fixes stamina resistance 2016-03-21 14:49:47 +01:00
Cheridan
0fafccf9ef Merge pull request #16178 from KazeEspada/GPStendrils 
Necropolis Tendrils emit an eerie signal.
 2016-03-21 02:53:15 -05:00
Jordie0608
5f4b341a4b fixes and user notification 2016-03-21 16:32:27 +11:00
Remie Richards
9aaf4ffc40 Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES 
Conflicts:
	icons/obj/hydroponics/equipment.dmi
 2016-03-21 05:03:33 +00:00
Remie Richards
be0b16a6aa Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder. 
Beeboxes have honey_frames which determine the amount of honeycomb+bees they can maintain.
Bees now have a beegent (Bee reagent, geddit?) that they use during their attacks AND that their produced honeycomb contains, this allows you to farm chemicals using bees.
 2016-03-21 04:51:16 +00:00
Cheridan
dae163e814 Merge pull request #16226 from KorPhaeron/tentacle2 
Anchors goliath tentacles
 2016-03-20 19:25:33 -05:00
Joan Lung
d7f81ba433 Merge pull request #16190 from KorPhaeron/tastetherainbow 
Mineral Golems
 2016-03-20 18:38:00 -04:00
Xhuis
28a767043a A few more optimizations 2016-03-20 12:21:14 -04:00
Xhuis
ce7118c893 Implements @phil235's recommended changes 2016-03-19 23:37:10 -04:00
Nerd Lord
b07f39771b slow-ass lightning overlords 2016-03-19 23:07:59 -04:00
Cheridan
c6ab8b0041 Merge pull request #16165 from ChangelingRain/cultlock 
Nar-Sie will now corrupt airlocks, tables, windows, and windoors
 2016-03-19 21:58:12 -05:00
Nerd Lord
46a9de4e43 terrifying lightning overlords 2016-03-19 22:54:09 -04:00
Cheridan
72256282cf Merge pull request #16162 from KorPhaeron/cats 
Restores runtime to his original look
 2016-03-19 21:48:21 -05:00
Cheridan
454af7cb2d Merge pull request #16197 from KorPhaeron/crates 
Adds abandoned crates to lavaland (sort of)
 2016-03-19 21:29:18 -05:00
KorPhaeron
26b4c8c03a Tentacle 2016-03-19 19:55:21 -05:00
oranges
2311102c7b Refactors the bulk string framework 
In favour of a better json based solution
This overhauls:
    -AI ion laws
    -NPC chatter text

The system is extended to support further splitting of a chosen line
where a line is picked and then searched for subkey's in the form of
@pick(\D+) - sub keys are then picked from the appropriate list that
matches the \D+ key and replaced over top of the placeholder

This is used to add braindamage gibbering messages to the system
 2016-03-19 22:37:32 +00:00
Nerd Lord
4af2397a92 gotta update health 2016-03-19 17:48:41 -04:00
Xhuis
b5f0726028 Code optimization 2016-03-19 17:34:42 -04:00