cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,882 Commits 61 Branches 14 Tags
490aadf35b342fc2b3ff982ddbca3cd59b9ea6a6
Commit Graph

14676 Commits

Author SHA1 Message Date
Cheridan
004e59864a Merge pull request #16261 from Core0verload/pda_close 
Kills snowflakey PDA close button
 2016-03-26 14:30:07 -05:00
Cheridan
3c69d18cc2 Merge pull request #16296 from lzimann/viewrangevehicles 
Adds a way to change vehicles view range
 2016-03-26 14:26:28 -05:00
Cheridan
b361ae5cf7 Merge pull request #15671 from CPTANT/Newtaser 
Introduces the new taser.
 2016-03-26 14:18:09 -05:00
Cheridan
ee005094a9 Merge pull request #16341 from Core0verload/sorted 
Allows sorting junction to have multiple sorting tags set
 2016-03-26 14:14:13 -05:00
Cheridan
02c8beba12 Merge pull request #16400 from KorPhaeron/nullspace 
Fixes ghost spawners putting people in nullspace
 2016-03-26 13:42:51 -05:00
KorPhaeron
721e3ba1a5 Ghost nullspace 2016-03-26 13:26:34 -05:00
Cheridan
647e17deed Merge pull request #16349 from Incoming5643/this_isnt_omnious_at_all 
Humanless stations are now possible (not by default calm down)
 2016-03-26 10:25:54 -05:00
Jordie
2714a656d5 Merge pull request #16355 from KazeEspada/eastercabin2 
Adds easter to Cabin
 2016-03-26 16:14:33 +11: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
KazeEspada
63d29e7f99 Adds easter bunnies to cabin for easter, removes a bad variable from the map. 2016-03-25 00:41:14 -07:00
Incoming
1a61c5f4ec Removes the human biases from preferences code. You can now run stations without any humans if you want. 
Caveat: All humanized monkeys will still be human, I tried to fix this but thanks to what seems to be a race condition doing so made roughly 50% of all humans drop dead at the first life tick.

Updates the race list in game_options.txt. Our servers don't auto update config files, so this is just for anyone who makes a server going forward.
 2016-03-25 00:26:18 -04:00
Nerd Lord
06da199b43 briefly cannot recall; changed damage to 50/13 2016-03-24 21:06:52 -04:00
c0
6de0230c6d Allows sorting junction to have multiple sorting tags set 2016-03-25 03:41:15 +03: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
Leo
bac9031a32 Adds a check for clients. 
Otherwise bad things will probably happen
 2016-03-23 17:48:32 -03: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
Leo
e10b0753d0 Guess you can't use world.view here 2016-03-23 00:16:20 -03:00
Lzimann
0a8103ea70 Adds a way to change vehicles view range 2016-03-23 00:00:54 -03:00