cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-06 22:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,565 Commits 63 Branches 14 Tags
bc065d4bbc69a907b37effe59169a4599bd8596f
Commit Graph

25579 Commits

Author SHA1 Message Date
81Denton
07c44a1f44 Fixes access reqs on public autodrobes/boozeomats (#38603) 
* Fixes access reqs on Delta+Meta autodrobes/boozeomats

* box boozeomat

* come ON travis

* do it
 2018-06-19 19:45:39 -04:00
Jordan Brown
a4a6d3ec77 Merge pull request #38549 from AutomaticFrenzy/patch/vending-machines 
Improve how vending machine restocking works
 2018-06-19 19:44:22 -04:00
Jordan Brown
84a85a5a3a Merge pull request #38574 from ninjanomnom/glob-signals 
Global component signals
 2018-06-19 18:18:11 -04:00
Tad Hardesty
eaf8bc3b42 Merge remote-tracking branch 'upstream/master' into patch/vending-machines 2018-06-19 13:07:13 -07:00
Armhulen
f337890fc3 Admin Kicks now prompt the admin to avoid accidental kicking (#38544) 
* TO THE PLAAAAAACE I BELOOOOOONG

* TAKE ME HOOOOOOOOOOME

* WEEEEEEST VIRGINIAAAAAAAAAAAAAAAAAAA

* fixes my shit

* No meming in admin frontend
 2018-06-19 15:12:10 -04:00
Jordan Brown
d52d16832e Merge pull request #38580 from Hyacinth-OR/pinkscarf 
Adds a pink scarf
 2018-06-19 10:49:27 -04:00
JStheguy
4ca07f7cf2 [READY] Helps data disks stop being unemployed (#38319) 
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
 2018-06-19 16:22:59 +02:00
Jordan Brown
0d182e65fd Merge pull request #38576 from AnturK/runtimeL 
Fixes alternative method of removing legcuffs.
 2018-06-19 10:19:10 -04:00
Jordan Brown
14eb92cde9 Merge pull request #38583 from cyclowns/patch-3 
Fixes BZ reaction not working
 2018-06-19 10:01:13 -04:00
vuonojenmustaturska
db4c1d56ce Some tiny optimizations to atmos and chatcode (#38564) 
* ever onward

* to_chat memes
 2018-06-18 23:57:52 -04:00
Jordan Brown
ef899ee443 Dsay now shows admin rank instead of ADMIN (#38555) 
* Dsay now shows admin rank instead of ADMIN

* All caps to protect the dongs of our admemes
 2018-06-18 17:17:30 -07:00
Jordan Brown
7c84d4f464 Makes a thing use its macro (#38556) 2018-06-18 17:16:57 -07:00
cyclowns
5c9c25a1ea fixes BZ reaction 2018-06-18 12:56:43 -07:00
Jordan Brown
cf7e8aa9ec Qdels queries, adds sleep safety checks, DBcore checks for leaks (#38363) 
* Qdels all queries, adds sleep handling

* DB Core messages admins about undeleted queries

* Compile fixes. Adds missing set waitfor

* Remove world/New shennanigans. Add DBQuery/BlockingExecute()

* Less spammy notifications to admins about undeleted queries

* Increase dbcore fire time to 1 minute

* Upgrade undeleted query warning

* Better place of death

* Fix build

* Remove BlockingExecute, see BSQL PR for why

* Yep, missed that one.

* Psyche, that's the WRONG QUERY!!
 2018-06-18 22:48:35 +03:00
Jordan Brown
abd415f700 Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode 
Allow admin ghosts to use .p and .d say prefixes
 2018-06-18 14:15:54 -04:00
Jordan Brown
57afa163a9 Merge pull request #38552 from AutomaticFrenzy/patch/labor-shuttle 
Fix gulag shuttle moving instantly
 2018-06-18 14:13:09 -04:00
Hyacinth
fe1b73f070 Adds pink scarf to vendomat 2018-06-18 10:01:28 -07:00
AnturK
041199e8a3 Fixes alternative method of removing legcuffs. 2018-06-18 13:08:36 +02:00
Tad Hardesty
cde78d069a Fix repairing Cyborg headlamp even when its panel is closed (#38550) 2018-06-18 04:03:21 -04:00
Tad Hardesty
8834612336 Fix item fortification scrolls stacking (#38551) 2018-06-18 04:02:26 -04:00
ninjanomnom
71e2354d48 Adds global signals and a silly example use case 2018-06-18 03:06:09 -04:00
CitrusGender
0e718f1337 Fixes the Blob being banished to the shadow realm (#38461) 
* blob now respawns like nuke disk if off z-level

* can't do it, sorry nak

* space

* muh codebaby

* Revert "CitrusGender my friend, don't you start away uneasy"
 2018-06-17 18:06:18 -07:00
81Denton
3125b2ebba Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-17 17:50:21 -07:00
Tlaltecuhtli
eaa0b551df Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-17 13:37:34 -07:00
Tad Hardesty
cdfe1261d1 Fix cargo pack descriptions 2018-06-17 12:47:59 -07:00
81Denton
ae2ad89295 Cleans up supermatter related varedits (#38540) 
* Cleans up supermatter related varedits

* reee

* fakecrystal
 2018-06-17 12:32:42 -04:00
Jordan Brown
0a7fb53a3c Merge pull request #38518 from AutomaticFrenzy/patch/uplinks 
Block default interact when opening an unlocked uplink
 2018-06-17 12:13:56 -04:00
Jordan Brown
16a0814601 Merge pull request #38527 from AutomaticFrenzy/patch/ripples 
Fix ripples appearing too broadly and disappearing too soon
 2018-06-17 12:11:33 -04:00
Jordan Brown
0619afdf79 Merge pull request #38522 from AutomaticFrenzy/patch/auxbase 
Allow the mining shuttle to fly to the aux base construction room
 2018-06-17 12:10:28 -04:00
ShizCalev
6d558b6bcf puts a / at the start of some obj instances (#38545) 2018-06-17 19:10:06 +03:00
Tad Hardesty
169045febe Allow admin ghosts to use .p and .d say prefixes 2018-06-17 03:03:15 -07:00
Tad Hardesty
db11c6e6e9 Fix labor shuttle moving instantly 2018-06-17 02:35:00 -07:00
Tad Hardesty
75dd6d7158 Improve readability of ripple check 2018-06-17 01:24:03 -07:00
Tad Hardesty
870ac15480 Improve how vending machine restocking works 2018-06-16 23:02:41 -07:00
Jordan Brown
5d01dd2dab Gives shamebrero penguin a chance to appear in the holodeck (#38492) 2018-06-16 23:36:23 -04:00
Jordan Brown
f9af896f6c Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 16:53:02 -04:00
Jordan Brown
df7ca1605b Merge pull request #38535 from DaxDupont/circuits 
[s] Removes circuit exploit
 2018-06-16 16:50:07 -04:00
Jordan Brown
175a366ceb Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
 2018-06-16 16:49:02 -04:00
Dax Dupont
42b65eaa0d Cleans up the chem synths jesus christ what the fuck (#38510) 
* Cleans up the chem dispensers jesus christ what the fuck

* Also hey you can set unit amounts now
 2018-06-16 13:37:58 -07:00
81Denton
080c681154 Makes the caravan ambush ruin harder to cheese (#38509) 
* makes caravan ambush more challenging

* SMASH
 2018-06-16 13:37:19 -07:00
Tad Hardesty
05107047dc Merge pull request #38098 from kevinz000/transit_space_refactor 
Transit space refactor
 2018-06-16 12:40:37 -07:00
cyclowns
4afd3b43bb [READY] [TESTED] Fusion Rework Episode V: The Phantom Fusion (#38329) 
* initial iteration

* overlooks

* division -> multiplication

* less magic defines

* meant magic numbers, also BZ reqs -> N2O and plasma

* fusion now reacts to give higher temps

* iteration 2, thanks @Manybones

* small changes

* C O N S I S T E N C Y + more higher bigger temperatures

* testing shit and balance pass ignore this

* major balance pass, woohoo time for more TESTING

* whoops

* minor balancing

* radiation is more better

* desmos links..

* silly me

* more radiation buffs and remnants

* reverting a change i made at 2 am
 2018-06-16 22:39:44 +03:00
Dax Dupont
3aa97fe725 Removes circuits 2018-06-16 21:15:47 +02:00
Tad Hardesty
d4415e5387 Fix ripples appearing too broadly and disappearing too soon 2018-06-16 02:58:28 -07:00
Tad Hardesty
b09204016b Set area type on the public mining dock 2018-06-15 23:53:13 -07:00
Armhulen
960837c16b quickie fixies (#38511) 2018-06-16 02:33:29 -04:00
Tad Hardesty
695f2a3af5 [s] Prevent unbreakable ladders from being moved by shuttles (#38477) 
* Prevent unbreakable ladders from being moved by shuttles

* Disconnect ladders before and reconnect them after shuttle move
 2018-06-15 22:43:42 -04:00
Tad Hardesty
64886a75e6 Block default interact when opening an unlocked uplink 2018-06-15 19:36:44 -07:00
Tad Hardesty
d1161404db Change nuclear uplinks to not be radios 2018-06-15 19:36:44 -07:00
Jordan Brown
9bcba47654 Merge pull request #38456 from theo2003/circuit_scan 
Players who edited a circuit assembly can scan it as a ghost.
 2018-06-15 15:03:48 -04:00