bawhoppen
96fd665676
honk
2016-03-25 23:12:44 -05:00
Lularian
2b700895a8
swat stuff
2016-03-25 22:48:38 -05:00
Joan Lung
c5d96796f7
Merge pull request #16275 from KorPhaeron/FREEGOLEM
...
Lavaland Golems
2016-03-25 23:32:39 -04:00
KorPhaeron
84290c21bc
FREE GOLEM
2016-03-25 22:25:18 -05:00
KorPhaeron
197490e726
FREE GOLEM
2016-03-25 22:10:13 -05:00
KorPhaeron
31dea914a2
Merge pull request #16304 from ChangelingRain/vinelayer
...
Space vine mobs now layer under ghosts
2016-03-25 20:24:56 -05:00
Nerd Lord
e0d355ced9
why bother with a new PR rite
2016-03-25 21:15:04 -04: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
KorPhaeron
a1ba04ef94
Merge pull request #16358 from tgstation/RemieRichards-patch-1
...
Updates the prices of Bee crates
2016-03-25 09:59:43 -05:00
KorPhaeron
da06025ced
Merge pull request #16241 from PKPenguin321/patch-16
...
anotha reactive teleport armor nerf
2016-03-25 09:58:36 -05:00
Remie Richards
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
Nerd Lord
06da199b43
briefly cannot recall; changed damage to 50/13
2016-03-24 21:06:52 -04:00
Lzimann
ad111138b2
I'm a skrub
2016-03-24 18:25:02 -03: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
Remie Richards
9f5114ee51
istype -> ishuman
2016-03-24 20:38:15 +00: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
Cheridan
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
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
PKPenguin321
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
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
Cheridan
78cf5b566d
Merge pull request #16280 from Iamgoofball/patch-8
...
Buffs CLF3
2016-03-23 12:57:20 -05:00
duncathan salt
fd36e4c090
Merge pull request #16257 from PKPenguin321/shshashaaa
...
gives sand a new function
2016-03-23 11:38:50 -06: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
duncathan salt
4c5cce9529
fixes a LINDA bug
2016-03-23 09:41:01 -06: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
Razharas
ec46771fc5
Merge pull request #15921 from Iamgoofball/goon_port
...
Goon Port #1 : Stock Market
2016-03-23 04:42:22 +03:00
AndrewJacksonThe2nd
156b7487b0
sdasdfadqadqd
2016-03-22 18:28:57 -07:00
AndrewJacksonThe2nd
57b2faf988
wake me up
2016-03-22 18:25:02 -07:00
AndrewJacksonThe2nd
88b0f8a87b
aaaaaaaaaaaaaaaaaaaa
2016-03-22 17:37:33 -07:00
KorPhaeron
6df3dd47d6
Merge pull request #16266 from Lumipharon/botany5001
...
Makes some plants a bit better
2016-03-22 19:24:59 -05:00
AndrewJacksonThe2nd
d70279e203
Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port
2016-03-22 16:13:17 -07:00
AndrewJacksonThe2nd
09c3bb3be1
stock market
2016-03-22 16:09:36 -07: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
b6b8a3eb09
Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
...
Grenade belt for nukeops
2016-03-22 19:35:43 +01:00
AnturK
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
AnturK
0252a01115
Merge pull request #16181 from Jordie0608/goodcodingpracticesarelikeusefulcommentsthisfilehasneither
...
Cleanup of polling code
2016-03-22 19:25:56 +01:00
