cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
a1ba04ef94
Merge pull request #16358 from tgstation/RemieRichards-patch-1
...
Updates the prices of Bee crates
2016-03-25 09:59:43 -05:00
da06025ced
Merge pull request #16241 from PKPenguin321/patch-16
...
anotha reactive teleport armor nerf
2016-03-25 09:58:36 -05:00
496190a4e2
Updates the prices of Bee crates, due to Goofcargo thinking big numbers is ~more fun~ or something.
2016-03-25 14:47:36 +00:00
ad111138b2
I'm a skrub
2016-03-24 18:25:02 -03:00
209884a516
Merge pull request #16262 from RemieRichards/BEES_glorious_BEES
...
Reagent Bees Revengenace
2016-03-24 21:45:31 +01:00
9f5114ee51
istype -> ishuman
2016-03-24 20:38:15 +00:00
7c2203857c
Merge pull request #16147 from Xhuis/bacchus_approves
...
Alcohol Refactor (Merge-Ready)
2016-03-24 19:05:56 +01:00
ddb2c2a0cb
Merge pull request #16306 from tgstation/duncathan-patch-1
...
fixes a LINDA bug introduced by listmos
2016-03-24 12:36:54 -05:00
f42928fb4e
Merge pull request #16077 from Buggy123/floorbotbuff
...
Buffs Floorbots
2016-03-24 17:16:12 +01:00
63aa7358f4
Merge pull request #16291 from ChangelingRain/holobuff
...
Buffs lightning holoparasite to not be total shit
2016-03-23 21:13:17 -06:00
ae1b86b0fe
removes the need to reenable telearmor after the cooldown ends
...
you still need to reenable it manually if you get EMPed, though, as it has always been
2016-03-23 14:27:42 -07:00
4ab87e60cf
tis all
2016-03-23 16:38:04 -04:00
e2b63da3a6
generic typepath!
2016-03-23 16:21:30 -04:00
78cf5b566d
Merge pull request #16280 from Iamgoofball/patch-8
...
Buffs CLF3
2016-03-23 12:57:20 -05:00
fd36e4c090
Merge pull request #16257 from PKPenguin321/shshashaaa
...
gives sand a new function
2016-03-23 11:38:50 -06:00
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
4c5cce9529
fixes a LINDA bug
2016-03-23 09:41:01 -06:00
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
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
80718dc883
Merge pull request #16277 from Incoming5643/Runtime_PLEASE
...
Hopefully resolves Runtime catastrophe
2016-03-22 23:23:11 -05:00
ec46771fc5
Merge pull request #15921 from Iamgoofball/goon_port
...
Goon Port #1 : Stock Market
2016-03-23 04:42:22 +03:00
156b7487b0
sdasdfadqadqd
2016-03-22 18:28:57 -07:00
57b2faf988
wake me up
2016-03-22 18:25:02 -07:00
88b0f8a87b
aaaaaaaaaaaaaaaaaaaa
2016-03-22 17:37:33 -07:00
6df3dd47d6
Merge pull request #16266 from Lumipharon/botany5001
...
Makes some plants a bit better
2016-03-22 19:24:59 -05:00
d70279e203
Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port
2016-03-22 16:13:17 -07:00
09c3bb3be1
stock market
2016-03-22 16:09:36 -07:00
d6ed7188e2
dreams really do die
2016-03-22 16:09:50 -04:00
905a72069b
Buffs lightning holoparasite to not be total shit
...
Adds two new, admin-only guardian types
2016-03-22 16:07:37 -04:00
b6b8a3eb09
Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
...
Grenade belt for nukeops
2016-03-22 19:35:43 +01:00
6a00718ed0
Merge pull request #16252 from erwgd/PmanJsuitExtgshFix
...
Plasmaman jumpsuit now only extinguishes wearer if they are on fire
2016-03-22 19:27:58 +01:00
0252a01115
Merge pull request #16181 from Jordie0608/goodcodingpracticesarelikeusefulcommentsthisfilehasneither
...
Cleanup of polling code
2016-03-22 19:25:56 +01:00
2a327b1b7b
Merge pull request #16188 from Robustin/zap
...
Singularity beacon now attracts the Tesla Ball
2016-03-22 19:18:45 +01:00
c5746e84ae
Merge pull request #16267 from CPTANT/Staminafixnew
...
fixes #15316 - Stamina resistance being applied twice
2016-03-22 13:03:14 -05:00
9164bbdb20
Merge pull request #16263 from KorPhaeron/mine_turfs
...
Cleans up mining turf code
2016-03-22 13:30:16 -04:00
c22fa4b907
Buffs CLF3
...
>maxcap CLF3 foam
>thunderdome
>total of 2 burned tiles and a single plating was made
yeah no
this is CLF3
🆑
rscadd: CLF3 now melts, burns, and destroys floors a lot more often, as it should be.
rscadd: CLF3 now makes 3x3 fireballs on tiles it touches now, instead of a single fireball.
/🆑
2016-03-21 23:51:01 -07:00
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
9862f9b8d4
Layers
2016-03-21 17:08:14 -05:00
4865ca6a7e
a donk
2016-03-21 18:08:05 -04:00
f062e54887
too close must conflict
2016-03-21 17:30:39 -04:00
916e1cada0
Modifies alcohol poisoning formula, thanks to @phil235
2016-03-21 17:03:19 -04:00
cfe7af21e7
Mine turf cleanup
2016-03-21 15:55:31 -05:00
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
6b65866444
Merge pull request #16210 from ChangelingRain/lightningmaster
...
Adds Lightning Holoparasites
2016-03-21 15:34:59 -05:00
ed8ca553b4
Fixes, Improvements, Feedback - Wave 1
2016-03-21 18:05:28 +00:00
7627e1c0e2
Merge pull request #15859 from Core0verload/wall_flash
...
Wall mounted flashes are now buildable
2016-03-21 12:32:55 -05:00
f8a59bb002
Update uplink_item.dm
2016-03-21 10:52:26 -04:00
fbbd5b0259
fixes stamina resistance
2016-03-21 14:49:47 +01:00
acb3941312
Improved various plants and added extra chemicals to others - Being a botanist should now be more FUN.
2016-03-22 00:07:11 +13:00
Xhuis
KorPhaeron
Remie Richards
Lzimann
AnturK
phil235
Cheridan
duncathan salt
PKPenguin321
Nerd Lord
Razharas
AndrewJacksonThe2nd
Iamgoofball
Incoming
KorPhaeron
Robustin
CPTANT
Lumipharon