cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 15:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,381 Commits 61 Branches 14 Tags
df9d4c8db3b730c9d0b2968cfc821acccdd4a4cd
Commit Graph

18101 Commits

Author SHA1 Message Date
duncathan salt
df9d4c8db3 removes try/catch block 2016-10-28 09:53:24 -06:00
duncathan salt
a21418d74a makes it compile (I think) 2016-10-27 18:52:20 -06:00
duncathan salt
a44aa7193a this is what I get for using the github editor 2016-10-27 18:44:12 -06:00
duncathan salt
f5282b7fb4 adds a pair of parentheses 2016-10-27 18:36:56 -06:00
duncathan salt
033446b6a8 more debug stuff to solve atmos runtimes 2016-10-27 14:08:10 -06:00
Razharas
2c9e07698f Merge pull request #21186 from ChangelingRain/rangedreference 
Ranged abilities now have a reference to their user
 2016-10-26 20:21:17 +04:00
chowdermcarthor
c7e474ccae Neck Slots (#21169) 
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
 2016-10-26 19:03:41 +13:00
oranges
a95c45ec17 Merge pull request #21174 from XDTM/JAWS 
Fixes Jaws of Life being unbuildable
 2016-10-26 18:59:01 +13:00
Cyberboss
e67133b606 Hotkeys for target selection and run/walk (#21039) 
* About time someone did this

* also this

* One almost got away

* From '`' to 'B'

* Mercy kill this PR pls

* Help message

* You could've told me how that took forever

* Update help
 2016-10-26 18:57:38 +13:00
Cyberboss
c7d140778b Fixes #21140 (#21168) 2016-10-26 09:55:07 +13:00
Joan Lung
09b426df79 Splits various massive clockwork cult code files up into various folders (#21177) 
* Splits various massive clockwork cult code files up into various folders

* JUST1C4R

* 4BSURD

* this is faintly horrifying to look at

* that's right i don't need to double it, just to swap the order
 2016-10-26 09:50:04 +13:00
Joan Lung
f6738d0e2a Ranged abilities now have a reference to their user 2016-10-25 11:18:51 -04:00
lordpidey
3b16e0c83e Adds LARPing. (#21053) 
* Starts to add a new wizard spell, based on the LIGHTNING BOLT! LIGHTNING BOLT! LIGHTNING BOLT meme.

* Adds spell to spellbook, and makes it functional.

* Fixes compile error

* Casting the spell now automatically readies your throw.

* Pitchforks don't auto throw

Summon pitchfork no longer also auto throws.
 2016-10-25 15:13:16 +13:00
Cheridan
4cfb9fc095 Merge pull request #21163 from bgobandit/vdayfix 
Withholds love from the dead.
 2016-10-24 16:43:04 -05:00
oranges
aa0ec8b5a7 Merge pull request #21155 from kevinz000/thanksphil--) 
[FIX]Anomalous Crystals are now RESISTANCE FLAGS = INDESTRUCTIBLE
 2016-10-24 22:55:17 +13:00
ExcessiveUseOfCobblestone
54bb13c412 Buzz! (#21144) 
* God Save The Queen!

* forgot to add it to autodrobe

* dumb

* makes the bee suit prettier

* actually let's look at this

* fixes minor graphical memes of bee suit

* fuck me

* yes

* DUMB V2
 2016-10-24 22:54:54 +13:00
oranges
ed8afc069a Merge pull request #21143 from MrStonedOne/patch-258 
Fix Spectral Blade not counting orbiting ghosts correctly
 2016-10-24 22:54:13 +13:00
Joan Lung
40d331ab5a The Judicial Visor no longer requires an open hand to use (#21138) 
* The Judicial Visor no longer requires an open hand to use

* SMITE

* ew ew ew
 2016-10-24 22:54:04 +13:00
oranges
6984de7cc4 Merge pull request #21103 from CyberbossJHCB/SprayDispenser 
Allows spray bottles to be used in the chem dispenser
 2016-10-24 22:52:56 +13:00
ma44
be9093ae27 Reminds the user that reading a book or writing a book while blind is stupid (#21117) 
* Update lib_codex_gigas.dm

* Update lib_codex_gigas.dm

* Update lib_codex_gigas.dm

* Update lib_items.dm

* Update lib_codex_gigas.dm
 2016-10-24 22:52:40 +13:00
swindly
7caded5cc8 Allows ChemMasters to make multiple bottles at once (#21021) 
* chem masters can make multiple bottles

* replaces minmaxes with clamps

* fills bottles

* adds checks

* adds flag

* moves return
 2016-10-24 22:52:19 +13:00
XDTM
8a9e9cdc6d Fix 2016-10-24 11:40:50 +02:00
Cheridan
6c2ade9d49 Merge pull request #21149 from AdamElTablawy/patch-4 
Makes sniper rifle descriptions less shit
 2016-10-23 19:27:15 -05:00
Joan Lung
07d02b61c7 Merge pull request #21139 from swindly/bacon 
Makes cooked bacon filling brown
 2016-10-23 19:21:13 -04:00
Cheridan
5750afb341 Merge pull request #21134 from CyberbossJHCB/MissedASpotCheridan 
Fuck Pockets Pt. 2: Labcoat Boogaloo
 2016-10-23 14:43:45 -05:00
bgobandit
b527745bc2 compiling is for cucks 2016-10-23 12:51:28 -04:00
bgobandit
77582f8d51 valentines and hearts only go to the living; added new messages 2016-10-23 12:41:40 -04:00
uraniummeltdown
1635017bb2 Atmos Grenades (#21014) 
* adds atmos grenades to game and uplink

* added freon grenade, price is now 12 TC, made var for contents

* price is now 11 TC

* fixes knockout desc
 2016-10-24 00:15:51 +13:00
Cyberboss
858acdc9f3 Fixes NOHUNGER (#21090) 
* Im actually going to die of flu, send help

* REEEEEE howd this get here

* Dammit Joan my everything hurts!

* Cant sleep. shit code. travis loves me

* dammit orange. this was supposed to be easy!

* Specifically disallow the "vigourous" from pop up
 2016-10-24 00:13:44 +13:00
oranges
cfe94eb0f6 Merge pull request #21095 from yackemflam/patch-8 
Standard helmet nerf and riot helmet buff
 2016-10-24 00:11:46 +13:00
oranges
405c49dd0e Merge pull request #21120 from Niknakflak/The_Purple_One_for_you 
Adds the purple skirt; Changes some bad paths
 2016-10-24 00:09:01 +13:00
oranges
ff88f995ee Merge pull request #21127 from CyberbossJHCB/BurnTheWitch 
Bit of code cleanup suggested in an issue
 2016-10-24 00:07:40 +13:00
oranges
79ae0cdaa0 Merge pull request #21125 from CyberbossJHCB/TheDoorsAreBetter 
Brig/Medbay door button now opens simultaneously
 2016-10-23 18:19:38 +13:00
kevinz000
c5de1b93ff wew 2016-10-22 21:52:41 -07:00
AdamElTablawy
9c82aab253 Makes sniper rifle descriptions less shit 2016-10-22 16:04:05 -07:00
Kyle Spier-Swenson
ca14ec7a70 Fix Spectral Blade not counting orbiting ghosts correctly 
I forgot that I made orbiters store orbit datums, not the atom orbiting.
 2016-10-22 13:32:29 -07:00
swindly
7ae0e0994a bacon is brown 2016-10-22 13:25:44 -04:00
Cyberboss
0e76767446 Fixes #20437 2016-10-22 11:14:00 -04:00
Cyberboss
447c44e1b9 Simplify further 2016-10-21 22:36:35 -04:00
Joan Lung
a4e807e9da Merge pull request #21081 from lzimann/patch-15 
Makes shuttles roadkill gib again
 2016-10-21 21:20:20 -04:00
Leo
5f15879bbf Removes now unused variable 2016-10-21 23:09:05 -02:00
Cyberboss
dc5baeca9b Above and beyond the call of duty 2016-10-21 20:29:54 -04:00
Cyberboss
dc0c7cd0f8 Oooh that feels good to look at. Fixes #14941 2016-10-21 20:03:51 -04:00
Cyberboss
8ebc86a3a2 Fixes #11347 2016-10-21 17:05:16 -04:00
NikNakFlak
8a85e7bcae Adds the purple skirt! 2016-10-21 11:42:16 -07:00
Cheridan
091e101b77 Merge pull request #20869 from Shadowlight213/gaswalkers 
Moves breathing from species to the lung organ
 2016-10-21 11:34:19 -05:00
oranges
3189f205e0 Merge pull request #21062 from swindly/pillshere 
Makes action button for a dental implant include the pill's name
 2016-10-21 22:51:20 +13:00
Cheridan
a37d117768 Merge pull request #21089 from phil235/swarmerFix2 
Fixes swarmer attack (stamina) on human/monkey being able to destroy clothes.
 2016-10-20 23:30:56 -05:00
Screemonster
60180cb0fd Makes the antitamper mechanism prevent tampering 2: electric boomaloo (#20893) 
* Sanitises input on abandoned crates

* Makes anti-tamper mechanisms detect tampering.

* Makes explosion trigger on take_damage() instead.
 2016-10-21 15:30:46 +13:00
Shadowlight213
0b37b5a99b Yay for Phil! 2016-10-20 19:21:34 -07:00