cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,049 Commits 61 Branches 14 Tags
41dc2df094fdc7ba30eb09db809f2f801ebb0dd7
Commit Graph

14772 Commits

Author SHA1 Message Date
KorPhaeron
41dc2df094 Merge pull request #16491 from bgobandit/speeling 
Fixes spelling in cargo crates
 2016-03-30 19:50:03 -05:00
Remie Richards
20597d0079 Merge pull request #16164 from Robustin/classiczombies 
Make zombies 2spooky
 2016-03-30 16:03:48 +01:00
KorPhaeron
f521cb2f90 Merge pull request #16460 from TehZombehz/honeyfood 
Adds some honey foods | Changes mead recipe
 2016-03-30 03:26:15 -05:00
bgobandit
0ee9691575 Fixes and standardizes spelling 2016-03-30 04:14:07 -04:00
TehZombehz
fa98ae963e Updates nutritional content with honey 
Since honey supposedly also acts as a mild healing chemical, replacing
vitamin with honey seems optimal.
 2016-03-30 03:07:27 -05:00
KorPhaeron
2a5fba89fd Merge pull request #16472 from coiax/gieger-in-suit-storage 
Added: Radiation suit storage holds gieger counter
 2016-03-30 02:28:47 -05:00
KorPhaeron
e6c52aa5b3 Merge pull request #16468 from PKPenguin321/patch-16 
Scales back grab nerf
 2016-03-30 02:27:59 -05:00
duncathan salt
5ff2020202 Merge pull request #16357 from Iamgoofball/fast 
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
 2016-03-29 20:06:55 -06:00
Xhuis
b44fa098ac Fixes animated statues being invisible 2016-03-29 19:56:33 -04:00
Cheridan
4df97395bd Merge pull request #16436 from ExcessiveUseOfCobblestone/patch-1 
You must be 18 or older to play
 2016-03-29 13:30:38 -05:00
Cheridan
0bb49b1a97 Merge pull request #16440 from TehZombehz/papersack 
Adds craftable paper sacks
 2016-03-29 11:27:41 -05:00
Razharas
c1e992e60c Merge pull request #16429 from ChangelingRain/datumholoname 
Holoparasite Theme/Name Datums
 2016-03-29 18:22:37 +03:00
Jack Edge
20072d681a Added: Radiation suit storage holds gieger counter 
Added the gieger counter to the suit storage of radiation suits.

Other suits have specific items allowed, makes sense for radiation suits to be the same.
 2016-03-29 09:23:08 +01:00
PKPenguin321
8337562f41 applies changes to breakout probabilities 
how come my salt PRs dont get merged but goofballs do
aggro grab:
25 -> 75 -> 50
neckgrab:
5 -> 50 -> 15
 2016-03-28 22:17:21 -07:00
PKPenguin321
6c58930df5 scales back grab nerf 
original value -> goof value -> new value
grab upgrade timer:
40 -> 100 (>2x bigger than original) -> 60 (1.5x bigger)
killgrab timer:
100 -> 150 -> 100 (didn't need to be changed originally)

readds the stun on neckgrab, but more than halves the duration
undoes the weaken nerf on the killgrab
 2016-03-28 22:08:32 -07:00
Cheridan
d371fe770a Merge pull request #16421 from Iamgoofball/SALTY 
[#SALTY] GRAB NERF [FUCK] [BALANCE] [#GRABDATNERF]
 2016-03-28 22:03:49 -05:00
Cheridan
69ae309a48 Merge pull request #16435 from Ricotez/ghostpreferencefix 
Fix ghost preference toggles and button name
 2016-03-28 21:48:47 -05:00
TehZombehz
58b964c6da Adds some honey foods and changes mead 
Adds honey buns, honey buns, and changes mead recipe to require honey.
 2016-03-28 18:57:01 -05:00
Cheridan
cf7885addd Merge pull request #16402 from Core0verload/revert-15671-Newtaser 
Revert "Introduces the new taser"
 2016-03-28 18:44:34 -05:00
Joan Lung
ce28a7ef3b Merge pull request #16419 from Cheridan/sorrypete 
Cleans up some text formatting
 2016-03-28 18:09:05 -04:00
Robustin
319ad93b6a Update zombie.dm 2016-03-28 18:03:34 -04:00
Nerd Lord
4089b0e1d8 actually I needed that 2016-03-28 18:01:13 -04:00
Nerd Lord
e1b263a56a statpanel includes some useful information, like WHAT THE FUCK IS MY SUMMONER'S HEALTH 2016-03-28 17:48:11 -04:00
Nerd Lord
5b14030c6b typo fixes 2016-03-28 15:17:04 -04:00
KorPhaeron
9bb1408040 Merge pull request #16424 from RemieRichards/bee_fixes 
Bee fixes and updates!
 2016-03-28 13:49:42 -05:00
Nerd Lord
63ba8d1b49 </span> 2016-03-28 12:11:11 -04:00
Nerd Lord
420d637f1e span classes update, reset guardian can now remove specific guardians instead of checking for each 2016-03-28 12:02:07 -04:00
Cheridan
f04d370659 Merge pull request #16417 from Xhuis/fix_bundle_2 
Small fix bundle
 2016-03-28 10:39:24 -05:00
Robustin
854fc36a5a Update zombie.dm 2016-03-28 10:51:36 -04:00
TehZombehz
dcaf8feecf Typo fix 2016-03-28 02:05:51 -05:00
TehZombehz
c83cc45ab2 Regular and smiley paper sack are now wearable if modified 
Use a sharp object on an empty regular or smiley face paper sack to
craft their respective wearable paper sack hats.
 2016-03-28 01:59:44 -05:00
TehZombehz
37a3c4373b Adds craftable paper sacks 
Adds craftable paper sacks
 2016-03-27 23:37:43 -05:00
KorPhaeron
3709f57f40 Merge pull request #16381 from ChangelingRain/justthetooltip 
Adds alien tooltip style and updates operative tooltip style
 2016-03-27 22:41:15 -05:00
ExcessiveUseOfCobblestone
3387774997 You must be 18 or older to play 2016-03-27 22:21:34 -04:00
Ricotez
8d84097d50 Fix Preference toggles and button name. 
+Fixes a bug where using the buttons in the Preference menu to change your Ghost Accessories or Ghosts of Others preference wouldn't save to your savefile.
+Changes the name of the "Ghost Display Settings" preference toggle to "Ghosts of Others" to fit in line with what the preference is called in the code and in the setup window.
 2016-03-28 03:29:31 +02:00
Nerd Lord
050b6326b9 assassin fix 2016-03-27 20:05:26 -04:00
Nerd Lord
6196b39351 update operative tooltip style(matches syndicate uplink theme) 2016-03-27 19:04:18 -04:00
Nerd Lord
bc4da3bfc8 decent meme 2016-03-27 18:15:49 -04:00
Nerd Lord
4f78208635 Holoparasite Theme/Name Datums 2016-03-27 18:08:02 -04:00
Cheridan
33ecd490b0 Merge pull request #16403 from optimumtact/wizared_mute_fix 
Mutes carbon wizards during jaunt
 2016-03-27 15:57:23 -05:00
Remie Richards
17defb66d4 Bee fixes and updates! 
* Added the ability to make Apiaries and Honey frames with wood
* Added the ability to make Royal Bee Jelly from 10 Mutagen and 40 Honey
* Added the ability to make more Queen Bees from Royal Bee Jelly by using it on an existing Queen, to split her into two Queens
* Made homeless bees more obvious
* Fixed a typo that made almost all bees homeless, severely reducing the odds of getting honeycomb
* Made bee progress reports (50% towards new honeycomb, etc.) always show, even if it's 0%
* Made some feedback text more obvious
* Fixed being able to duplicate the bee holder object, this was not exploity, just weird
* Fixed being able to put two (or more) queens in the same apiary
* Fixed some runtimes from hydro code assuming a plant gene exists
* Fixed runtime when you use a honeycomb in your hand
* It now takes and uses 5u of a reagent to give a bee that reagent
* Removed unused icon file
 2016-03-27 21:07:53 +01:00
KorPhaeron
525cd8afc6 Crate 2016-03-27 14:56:12 -05:00
KorPhaeron
ced69135ba Merge pull request #16378 from Bawhoppen/swatcratechange 
Seperates combat knives from SWAT crate
 2016-03-27 14:51:08 -05:00
AndrewJacksonThe2nd
535f3a1b4a aaaaaaaaaaaaaaaaaaaaaa 2016-03-27 12:19:46 -07:00
AndrewJacksonThe2nd
d6b41d73eb should fix grab resists 2016-03-27 12:17:36 -07:00
AndrewJacksonThe2nd
b8a60ffeb0 GRAB NERF 2016-03-27 12:15:14 -07:00
Cheridan
6f5b567866 Cleans up some text formatting 2016-03-27 14:13:16 -05:00
Cheridan
ca4e898abe Merge pull request #16376 from Tytynguyen/sleepingcarpdeflect 
Hopefully made the sleeping carp deflects more obvious
 2016-03-27 12:38:48 -05:00
Cheridan
20fb01cda2 Merge pull request #16265 from Iamgoofball/boss_of_this_lavaland 
hey spaceman i think you got the wrong vault
 2016-03-27 12:30:41 -05:00
Cheridan
ac9bd3a910 Merge pull request #16389 from KorPhaeron/tendril 
Fixes collapsing tendrils being draggable
 2016-03-27 12:26:27 -05:00