cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,170 Commits 61 Branches 14 Tags
0cabcdd6733a9e447a9fef6ec2c4111b075e5fec
Commit Graph

14839 Commits

Author SHA1 Message Date
Nerd Lord
0cabcdd673 Zombies can no longer remove more than one airlock at once 2016-04-03 20:34:18 -04:00
Cheridan
e1b7477857 Merge pull request #16579 from KorPhaeron/buffs_ignore 
Ignore Buffs
 2016-04-03 18:39:29 -05:00
bawhoppen
af51a66e37 Adds sandbags 
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
 2016-04-02 23:52:12 -04:00
Supermichael777
bcedee0f42 OOPS 2016-04-02 23:49:27 -04:00
KorPhaeron
c93abbb0b9 Adds Techno's absinthe to mining 
* Absinthe

* Formatting
 2016-04-02 23:48:24 -04:00
Joan Lung
a2bd358eb8 Merge pull request #16507 from PKPenguin321/patch-16 
fixes being able to grind guns with an autolathe
 2016-04-02 20:09:06 -04:00
KorPhaeron
69f9549a11 Ignore Buffs 2016-04-02 10:59:59 -05:00
AnturK
7e24fadedd Merge pull request #16542 from Isratosh/transformfix 
Fixing rudimentary transformation not working properly on ghosts with minds
 2016-04-02 11:36:36 +02:00
erwgd
3095d3bf21 Adds scalpel, syringes, DNA injectors to the list of allowed items in boots 
* added scalpel to the list of allowed items in shoes
* Put the scalpel on same line as others
* Added syringe to list of shoe items
* Added DNA injector to list of shoe items
 2016-04-02 11:32:17 +02:00
Isratosh
fa122fe793 Adding admin logs to bluespace shelter capsules. 
* Adding admin logs to bluespace shelter capsules.

* Only logs when not on mining or lavaland z level
 2016-04-02 02:42:18 -06:00
KorPhaeron
bb3d04d351 Merge pull request #16526 from LatD/NutriMax 
More plant analyzers to NutriMax
 2016-04-01 19:53:36 -05:00
Isratosh
75b350561a Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation 2016-04-01 01:32:59 -06:00
KorPhaeron
826844ecc6 Merge pull request #16504 from Eaglendia/fashion2 
Improves selections for head of staff fashion
 2016-03-31 22:06:29 -05:00
Joan Lung
82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22:10:07 -04:00
KorPhaeron
2be10e302f Uses temp overlays for material scanners 2016-03-31 17:15:06 -05:00
KorPhaeron
f2d5345093 Mesons 2016-03-31 17:02:50 -05:00
LatD
62f93b7a32 Adds hydrogen to grass 2016-04-01 00:09:33 +03:00
duncathan salt
1d32467096 Merge pull request #16496 from ChangelingRain/edgecases 
Fixes edge case where it was possible to get multiple parasites without admin intervention
 2016-03-31 12:20:41 -06:00
duncathan salt
8825858d9c Merge pull request #16492 from coiax/name-my-golems 
Lavaland Golems have a larger naming pool
 2016-03-31 12:20:10 -06:00
duncathan salt
b2cd470024 Merge pull request #16480 from erwgd/BiogenAscend 
Biogenerator and botany bottle improvements
 2016-03-31 12:16:43 -06:00
duncathan salt
bcc92cf76f Merge pull request #16471 from Core0verload/events 
Adds minimal players requirements for random events
 2016-03-31 12:14:44 -06:00
duncathan salt
f568ae3f31 Merge pull request #16425 from Thunder12345/varspotting 
Adds new atom and new datum options to viewvars
 2016-03-31 12:07:14 -06:00
duncathan salt
1183681424 Merge pull request #16393 from KorPhaeron/triggerwarninggoofball 
Math with goofball: Part 2
 2016-03-31 12:03:39 -06:00
duncathan salt
3315717ef9 Merge pull request #16348 from Shadowlight213/adminsoundvolume 
Adds client volume control for admin sounds.
 2016-03-31 11:59:52 -06:00
KorPhaeron
55434a673d Heavy Weapon Fix 2016-03-31 12:23:46 -05:00
KorPhaeron
40023cf843 Merge pull request #16495 from ChangelingRain/dazedzinnia 
Daisy and Zinnia holoparasites no longer try to kill your eyes
 2016-03-31 11:40:15 -05:00
erwgd
5fc02ccee8 moved all returns in generation ifs to new lines 2016-03-31 15:14:28 +01:00
erwgd
0109c274fb moved returns to new lines, put 10u black pepper 2016-03-31 15:09:45 +01:00
KorPhaeron
03216dce2e Merge pull request #16465 from TehZombehz/foodbox 
Adds random ingredient food packages to chefs
 2016-03-31 04:03:09 -05:00
KorPhaeron
a74b7c209c Mining Drone Upgrades 2016-03-31 03:41:03 -05:00
TehZombehz
229a90ba10 Reorganized for standards 2016-03-31 02:53:52 -05:00
duncathan salt
1ff5882696 Merge pull request #16473 from KorPhaeron/goliath_meat 
Goliath changes
 2016-03-31 00:35:13 -06:00
Eaglendia
d38e3e7cc1 Adds more options for CE and RD cloaks 2016-03-31 00:34:59 -05:00
duncathan salt
3d95d68b2f Merge pull request #16279 from Core0verload/HUDfuckery 
Slot icons micro-refactor
 2016-03-30 23:30:06 -06:00
KorPhaeron
507b48f8a3 Merge pull request #16476 from ChangelingRain/charrrrrrge 
Adds charger holoparasites to traitor
 2016-03-30 21:39:29 -05:00
KorPhaeron
41dc2df094 Merge pull request #16491 from bgobandit/speeling 
Fixes spelling in cargo crates
 2016-03-30 19:50:03 -05:00
PKPenguin321
0e93ef9544 fixes being able to grind guns with an autolathe 
>but revolver for 90000 TCs
>accidentally click autolathe when you're printing more ammo
>it turns into half a metal sheet's worth of material
 2016-03-30 17:03:43 -07:00
KorPhaeron
721ef94443 Fixes icons for real 2016-03-30 17:51:28 -05:00
Eaglendia
c706c9d2e9 Allows the head of staff cloaks to equip some signature items 2016-03-30 17:43:01 -05:00
KorPhaeron
9711586a70 Icon Fix 2016-03-30 17:31:40 -05:00
TehZombehz
0f26065c64 HOPEFULLY removes conflicts 
First attempt ev
 2016-03-30 17:12:55 -05:00
KorPhaeron
b388e76f9c Knives and thermal protection 2016-03-30 13:28:38 -05:00
KorPhaeron
fad0e3934e Fixes recoil, re-adds suit icon toggling 2016-03-30 13:11:33 -05:00
Remie Richards
20597d0079 Merge pull request #16164 from Robustin/classiczombies 
Make zombies 2spooky
 2016-03-30 16:03:48 +01:00
Nerd Lord
323ccce61b Fixes edge case where it was possible to get multiple parasites without admin intervention 2016-03-30 10:08:29 -04:00
Nerd Lord
6db538ef77 Daisy and Zinnia holoparasites no longer try to kill your eyes 2016-03-30 10:00:22 -04:00
Jack Edge
5c5734b006 More complicated golem name creation 
Free Golems now have names of the form MATERIAL SURNAME, where SURNAME
tends to be geological terms or rock types. Very occasionally, human
surnames creep in.
 2016-03-30 09:38:10 +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