cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-30 11:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,588 Commits 59 Branches 14 Tags
6f5ddea836da0a5d54870cd052d9e71f74ce8a45
Commit Graph

33917 Commits

Author SHA1 Message Date
XDTM
6f5ddea836 Fixes slimes not being able to latch onto humans + faction tweak (#24759) 
* tentadel

* back to normal

* Fixes slimes not being able to latch onto humans + faction tweak

* NO

* NO

* HUMANOIDS ONLY

* PUTTING THE PIG IN PIGGYBACK
 2017-03-09 09:11:20 +01:00
Cyberboss
645f3b1d75 Cuts out a chunk of map loader time for maps with a lot of space (#24764) 
* SPACE OPTIMIZATION

* Don't need this instancing anymore either

* Forgot to drop this

* FASTER!!!!

* FASTER!!!!!!!!!

* Move this back, it makes no difference

* Fix a potential bug

* FAAAAAAASSSSSSTTTTTTTTERRRRRR!!!!

* open

* Ye be warned

* Better diagnostics + fixes

* Fewer false positives

* Bleh

* Remove the unecessary z-expansions
 2017-03-09 11:24:51 +13:00
oranges
1e3db8d8bb Merge pull request #24742 from coiax/secondary-frozen 
Moves the `is_frozen` var to a secondary flag
 2017-03-09 11:20:51 +13:00
Cyberboss
31ee152489 Repaths subsystem to controller/subsystem (#24624) 
* Repaths subsystem to controller/subsystem

* Fix the shit
 2017-03-08 22:05:45 +01:00
Cyberboss
4c4d2c28f9 Fixes 179 (#24807) 
* Fixes 169

* What MSO said

* Fix

* Fite me travis
 2017-03-08 21:59:59 +01:00
kevinz000
ceb65bd66b [READY]Chameleon gun projectile disguising (#24574) 
* this'll end well

* hmm

* double hmm

* prevents emp crash

* why am i getting things wrong reee

* done

* .
 2017-03-08 21:56:25 +01:00
oranges
8073a51b45 Merge pull request #24814 from Cyberboss/conveyorfix 
Fixes conveyor switches
 2017-03-09 09:46:01 +13:00
oranges
7c43544eaa Merge pull request #24803 from Cyberboss/DoorButtonsAgain 
Fixes airlock cycling buttons
 2017-03-09 09:45:51 +13:00
oranges
0ecc08b304 Merge pull request #24801 from Cyberboss/patch-14 
Fixes cyclelinked airlocks
 2017-03-09 09:45:37 +13:00
Joan Lung
ea99851a07 Clockcult stuff has colored lighting (#24678) 
* Clockcult stuff has colored lighting

* fixsigils
 2017-03-08 12:03:12 -06:00
Jordie
edf7b049b1 hi oranges how are you 2017-03-08 22:52:41 +11:00
Supermichael777
d1118c903c Adds canned air (#24783) 
* adds canned air

* adds canned air

* air isnt cheap!

* Add files via upload

* oops

* Add files via upload
 2017-03-08 02:56:24 -06:00
Cyberboss
fac0d69009 Fixes spam after admin event cancellation adds feedback (#24787) 
* Fixes spam after admin event cancellation

* Add feedback
 2017-03-08 02:42:42 -06:00
coiax
f88184937a Glowsticks (#24761) 
* Ports glowsticks from Bay

* Adds glowstick sprites

* Glowsticks in party crates, maint and emergency toolboxes
 2017-03-08 02:38:15 -06:00
TalkingCactus
f04feec7a1 Adds Colored Lights for Energy Swords (#24765) 
* colored lights for energy melee weapons

* New() -> Initialize()

* dualsabers

* woops?

* removes unused var

fixes energy axe typo
 2017-03-08 02:34:50 -06:00
Cheridan
d95377b800 Merge pull request #24773 from TrustyGun/pretty_lights 
Laser beams have appropriately colored lights
 2017-03-08 02:32:39 -06:00
Cheridan
deb4c2cde3 Merge pull request #24743 from ChangelingRain/glowshrooms 
Glowshrooms now have colored light, tweaks glowshroom/glowberry lighting range
 2017-03-08 02:30:46 -06:00
Cheridan
d6905ed54e Merge pull request #24774 from ChangelingRain/computerlight 
Adds light colors for a few more computers
 2017-03-08 02:26:37 -06:00
Cheridan
7026d45b9e Merge pull request #24780 from ChangelingRain/basaltfix 
Fixes basalt lighting
 2017-03-08 02:25:38 -06:00
Cheridan
6be409eb3b Merge pull request #24781 from ChangelingRain/requestlesslightfromcargoplease 
Request consoles are way less bright
 2017-03-08 02:24:13 -06:00
Jordie
808325d2a1 lolwhoops 
to be fair these changes worked when i tested, which was before this proc was added
 2017-03-08 18:23:46 +11:00
Cyberboss
7ed1ae0ce0 Derp 2017-03-07 21:11:34 -05:00
Cyberboss
93bb425e2c Fixes conveyor switches 2017-03-07 21:04:49 -05:00
coiax
2f180a8682 Fixes being unable to add materials to autolathe (#24812) 
Fixes #24811. Looks like I missed an old style hologram flag. Should
have really used a different name to highlight this, but oh well.
 2017-03-08 14:37:03 +13:00
coiax
2d288690e1 New Librarian traitor item: Haunted Magic Eightball (#24607) 
* New Chaplain traitor item: Haunted Magic Eightball

🆑 coiax
add: Toy magic eightballs can now be found around the station in
maintenance and arcade machines. Ask your question aloud, and then
shake for guidance.
add: Adds new Chaplain traitor item, the Haunted Magic Eightball.
Although identical in appearence to the harmless toys, this occult
device reaches into the spirit world to find its answers. Be warned,
that spirits are often capricious or just little assholes.
/🆑

* Compiles, fixes the bugs

* Adds toy eightballs to loot, toys; adds haunted to uplink

* Every 3 minutes

* Noiseless, random haunt, limited stock

* Added sprites for eightball

* Removed notice to replace sprites

* Librarian only
 2017-03-08 12:14:44 +13:00
coiax
311ea1c7f1 New wizard spell: The Traps (#24571) 
* New wizard spell: The Traps

🆑 coiax
add: Wizards now have a new spell "The Traps" in their spellbook.
Summon an array of temporary and permament hazards for your foes, but
don't fall into your own trap(s).
/🆑

Conjures some traps in an aoe, traps include Hand of God traps and
swarmer shocking traps. Hand of God traps require 60 seconds to recharge
between trapping.

I saw Cobby give this as a TC trade, and I thought it seems reasonable
as a silly wizard spell.

* Added The Traps to spellbook, modifed trap code more

* Adds action icon for The Traps

* Need to be adjacent to disarm

* Invocation is now Latin for "BEWARE THE TRAPS"
 2017-03-08 12:13:03 +13:00
Cyberboss
8552c09133 Forensic scanners can now scan storage objs (#24672) 
* Fix a spawn

* Use pre_attackby

* Fix this other spawn
 2017-03-08 12:04:02 +13:00
coiax
7775607a26 Improved supermatter headaches and voice (#24649) 
* Improved supermatter headaches and voice

🆑 coiax
add: You only have a headache looking at the supermatter if you're a
human without mesons.
add: The supermatter now speaks in a robotic fashion.
/🆑

* Hallucination range is a macro
 2017-03-08 12:03:14 +13:00
Jordie
dc39267b50 Merge pull request #24592 from KorPhaeron/catgirlbuff 
Mutant parts are removed if you roll a head job, as opposed to being barred from these jobs
 2017-03-08 09:58:55 +11:00
TrustyGun
8589a4e069 changes purple color 2017-03-07 17:55:17 -05:00
Cyberboss
d9e060a6ae Fixes map rotation message showing same map (#24756) 2017-03-07 23:21:15 +01:00
Cyberboss
afa9e14b6f Fixes #24800 2017-03-07 17:20:05 -05:00
PKPenguin321
3a1b0b2b6c Adds a new arcade prize, take two (#24660) 
* adds fake chasm tiles

* adds to arcade machine list

* swood this

* swood that
 2017-03-08 11:19:53 +13:00
Cyberboss
849b3e2d65 Roundstart Animation (#24357) 
* Juiciness intensifies

* Update the syntax
 2017-03-08 11:11:41 +13:00
Cyberboss
6ed18e01e1 Fixes cyclelinked airlocks 2017-03-07 17:06:50 -05:00
Jack Edge
69c227612f Moves the is_frozen var to a secondary flag 
One less var on ALL OBJECTS.
 2017-03-07 21:27:44 +00:00
oranges
37b194d6ed Merge pull request #24708 from Cheridan/the_c_does_not_stand_for_cheesy 
NERFS THE SHIT OUT OF C4+THROWING STARS BECAUSE ITS CHEESY AND SHAMEFUL
 2017-03-08 09:46:12 +13:00
Cyberboss
e9b01e6f4f Kills off an arbitrary number of spawn()s (#24730) 
* Kills off an arbitrary number of spawn()s

* Fix the shit
 2017-03-08 09:44:24 +13:00
Cyberboss
0f554741f0 Fixes some stuff with paper planes (#24729) 
* Fixes some stuff with paper planes

* Renames a misspelled argument
 2017-03-08 09:39:56 +13:00
Cheridan
d38b3aa7ce Merge pull request #24633 from LanCartwright/buckshotnerf02032017 
Adds negative damage scaling to Buckshot.
 2017-03-07 14:38:40 -06:00
Cyberboss
1f905114b0 Adds the UNTIL helper (#24728) 
* Adds the WAIT_FOR helper

* UNTIL

* Makes a thing use it
 2017-03-08 09:35:32 +13:00
oranges
904472d93c Merge pull request #24718 from coiax/hologram-secondary 
Demotes HOLOGRAM to secondary flag
 2017-03-08 09:25:21 +13:00
oranges
6a802bac03 Merge pull request #24750 from AnturK/SOMETIMELATER 
Fixes abductor console initialization.
 2017-03-08 09:24:25 +13:00
oranges
12e6d6c64c Merge pull request #24650 from coiax/admin-renaming-tools 
Admins have more tools for renaming the station
 2017-03-08 09:23:36 +13:00
bgobandit
a3c4a7d5a6 Reject ahelp and IC issues have a short cooldown (#24663) 
* Reject Adminhelp and IC Issue buttons have a cooldown.

* placates the lzimann cat
 2017-03-08 09:18:59 +13:00
Cyberboss
81433c4859 Removes an unused variable (#24749) 2017-03-07 21:14:49 +01:00
oranges
6c976bd2b2 Merge pull request #24719 from francinum/patch-1 
Fixes a misspelled path.
 2017-03-08 09:12:51 +13:00
oranges
145f551dda Merge pull request #24720 from francinum/patch-2 
Holopads now require power.
 2017-03-08 09:12:32 +13:00
oranges
5ec0b2e072 Merge pull request #24725 from Xhuis/soapstone_cleanup 
Cleans up soapstone code
 2017-03-08 09:11:37 +13:00
oranges
6a2cacc767 Merge pull request #24745 from Cyberboss/patch-19 
Fix a hallucination runtime
 2017-03-08 09:11:04 +13:00