Commit Graph

14608 Commits

Author SHA1 Message Date
Nerd Lord
e4f6a24da3 Guardians no longer damage other guardians that share a summoner. 2016-03-24 14:38:21 -04:00
Nerd Lord
c99d33ece0 more damage because it takes full damage 2016-03-24 12:17:07 -04: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
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
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
AnturK
2a327b1b7b Merge pull request #16188 from Robustin/zap
Singularity beacon now attracts the Tesla Ball
2016-03-22 19:18:45 +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
Joan Lung
9164bbdb20 Merge pull request #16263 from KorPhaeron/mine_turfs
Cleans up mining turf code
2016-03-22 13:30:16 -04:00
Iamgoofball
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
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
KorPhaeron
9862f9b8d4 Layers 2016-03-21 17:08:14 -05: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
KorPhaeron
cfe7af21e7 Mine turf cleanup 2016-03-21 15:55:31 -05: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
Cheridan
7627e1c0e2 Merge pull request #15859 from Core0verload/wall_flash
Wall mounted flashes are now buildable
2016-03-21 12:32:55 -05:00
Robustin
f8a59bb002 Update uplink_item.dm 2016-03-21 10:52:26 -04:00
CPTANT
fbbd5b0259 fixes stamina resistance 2016-03-21 14:49:47 +01:00
Lumipharon
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
Cheridan
a29aba94e9 Merge pull request #16206 from JJRcop/JJRcop-patch-1-1
buffs milk for skeletons and plasmamen (not stolen)
2016-03-21 03:59:54 -05:00
Cheridan
110c027792 Merge pull request #16245 from MrStonedOne/patch-172
Fixes ssair trying to proc unsimulated turfs.
2016-03-21 03:22:02 -05:00
KorPhaeron
b52e8cb847 Merge pull request #16213 from AnturK/buildmode_fix
Fixes buildmode dir
2016-03-21 03:16:31 -05:00
KorPhaeron
c95e64c17e Makes mine turfs less garbage 2016-03-21 03:00:51 -05:00
Cheridan
0fafccf9ef Merge pull request #16178 from KazeEspada/GPStendrils
Necropolis Tendrils emit an eerie signal.
2016-03-21 02:53:15 -05:00
Cheridan
bb97cb8a2a Merge pull request #16237 from PKPenguin321/patch-9
tweaks some evil fucking punctuation
2016-03-21 02:16:49 -05:00
Jordie0608
5f4b341a4b fixes and user notification 2016-03-21 16:32:27 +11:00
Jordie
d31bc85106 Merge pull request #16082 from Core0verload/plants-revengeofGMO
Adds a test version of bioengineering
2016-03-21 15:57:40 +11:00
bawhoppen
07ca0c9515 compromising is hard 2016-03-20 20:57:50 -05:00
bawhoppen
d410b37e2d more comrpomise 2016-03-20 20:12:36 -05:00
bawhoppen
f71de178c0 compromised 2016-03-20 20:10:22 -05:00
Lularian
83624574e5 tkdrg said to name commits something useful 2016-03-20 19:50:22 -05:00
Cheridan
dae163e814 Merge pull request #16226 from KorPhaeron/tentacle2
Anchors goliath tentacles
2016-03-20 19:25:33 -05:00