Xhuis
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
AnturK
209884a516
Merge pull request #16262 from RemieRichards/BEES_glorious_BEES
...
Reagent Bees Revengenace
2016-03-24 21:45:31 +01:00
phil235
7c2203857c
Merge pull request #16147 from Xhuis/bacchus_approves
...
Alcohol Refactor (Merge-Ready)
2016-03-24 19:05:56 +01:00
AnturK
f42928fb4e
Merge pull request #16077 from Buggy123/floorbotbuff
...
Buffs Floorbots
2016-03-24 17:16:12 +01: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
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
Xhuis
c461128a56
Alcohol refactor
2016-03-19 16:09:43 -04:00
Nerd Lord
392ebde0ca
slight efficiency change
2016-03-19 12:25:14 -04:00
Nerd Lord
050460227f
if alive, rebuild the summoner chain
2016-03-19 11:46:22 -04:00
Nerd Lord
6fc68ff9aa
fiiiiixed woo woo
2016-03-19 10:25:25 -04:00
KazeEspada
b5a48866bb
Fixes issues put forth by maintainers.
2016-03-19 01:09:32 -07:00
Nerd Lord
08903c8421
Adds Lightning Holoparasites
2016-03-19 03:56:59 -04:00
Cheridan
9e091ae4c3
Merge pull request #16161 from MrStonedOne/patch-169
...
Breathing requests a turf activation
2016-03-19 01:36:35 -05:00
KorPhaeron
ab263f6d90
Abandoned Crates
2016-03-18 20:54:20 -05:00
Nerd Lord
ddfd21bb47
Buffs Explosive Holoparasites
2016-03-18 20:34:51 -04:00
KorPhaeron
3f317a76a3
Rainbow Golems
2016-03-18 17:22:35 -05:00
Jordie0608
407c98a70d
cleanup of polling code
2016-03-18 23:21:57 +11:00
