cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 02:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,431 Commits 62 Branches 14 Tags
517f86ba76791c7393fd0dc5c2f9f480c91c3966
Commit Graph

40927 Commits

Author SHA1 Message Date
Leo
517f86ba76 Merge pull request #34533 from Buggy123/patch-56 
Fixes integrity value for non-reinforced plasma window
 2018-01-18 10:10:11 -02:00
kevinz000
117ef6f2e7 Removes sacid requirement 2018-01-17 16:02:43 -06:00
deathride58
0c282b8865 [READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916) 
* allows radiation collectors present on the station roundstart to generate research points

* fixes bitcoin production rate, fixes multitool not activating multitool_act properly

* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird

* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization

* fixes compiling error, is_station_level
 2018-01-17 12:17:25 -05:00
Jordan Brown
eb083410c9 Merge pull request #34509 from Iamgoofball/patch-365 
Super Surplus Crate
 2018-01-17 08:27:54 -05:00
Jordan Brown
38e8bdeaeb Merge pull request #34500 from Xhuis/recallfix 
fixes a mass recall runtime error that prevented it from working
 2018-01-17 08:09:10 -05:00
Buggy123
4ff5196a07 Fixes integrity value for reinforced plasma window 2018-01-17 02:56:08 -05:00
Jordan Brown
45048cbaf2 Merge pull request #34507 from AutomaticFrenzy/patch/sdql-jmp 
Add JMP buttons to SDQL select results
 2018-01-16 22:41:24 -05:00
Jack Edge
19c214514e Ghosts can start CTF on their own 
🆑 coiax
add: If enough people vote to start CTF (by clicking on a CTF controller
as a ghost), then CTF will automatically begin.
/🆑

- CTF will no longer restart 30 seconds after it ends, it requires
people to vote for it.
- Victory messages are coloured with the team's colour.
- Current number of people required to start CTF is 4 people.
 2018-01-16 19:21:25 -06:00
Kyle Spier-Swenson
fa136e71f4 Revert "Merge pull request #33537 from ninjanomnom/priority-defines" (#34528) 
This reverts commit 0244b61886, reversing
changes made to 5d07df08ea.
 2018-01-16 20:04:35 -05:00
arsserpentarium
d35f3da470 [READY]Circuitry lab (#34493) 
* spelling

* base

* maps

* merge

* firealarm

* floor

* floor again

* if you insist...

* DV

* DV(2)

* DV(3)

* fuck

* fuck

* apc

* boxapc
 2018-01-16 17:44:26 -05:00
Jordan Brown
9dcdbff711 Nothing in this commit (#34520) 2018-01-16 15:40:15 -05:00
oranges
387e09c08f Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-17 09:36:15 +13:00
oranges
073744fb19 Merge pull request #34322 from coiax/no-longer-harvested 
Removes ash flora being harvested on roundstart
 2018-01-17 09:35:23 +13:00
oranges
f065ee0098 Merge pull request #34378 from nicbn/yarr 
Pirates are now skeletons
 2018-01-17 09:34:07 +13:00
Ashe Higgs
ea5924bca8 Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow (#34427) 
* Portal tweaks, and blocked atmos

* Update servant_blocker.dm

* Update servant_blocker.dm

* Update servant_blocker.dm
 2018-01-17 09:33:19 +13:00
oranges
7fe928d11a Merge pull request #34468 from ShizCalev/redundant-trim 
Cleans up some redundant stripped_input usage
 2018-01-17 09:32:00 +13:00
oranges
afd92a5b12 Merge pull request #34464 from uraniummeltdown/dumbcult 
Removed the dumb iscultist() check in runed metal's attack() proc
 2018-01-17 09:31:15 +13:00
kevinz000
6ebc926f00 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-17 09:30:14 +13:00
oranges
30dfc429dd Merge pull request #34473 from kevinz000/techwebs_points 
Nerfs techweb cargo points
 2018-01-17 09:29:25 +13:00
oranges
6cfede150c Merge pull request #34457 from AutomaticFrenzy/patch/air-status 
Combine and fix Show Air Status and Air Status in Location
 2018-01-17 09:28:52 +13:00
oranges
a19b55564f Merge pull request #34477 from tgstation/Cyberboss-patch-2 
Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-17 09:28:25 +13:00
oranges
31217df709 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-17 09:27:35 +13:00
oranges
5adf17bf4a Merge pull request #34413 from kevinz000/patch-430 
Allows C4 on mobs again
 2018-01-17 09:27:09 +13:00
oranges
b979a01711 Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement 
Fix RPD embedding fixtures inside lattices and girders
 2018-01-17 09:26:11 +13:00
F-OS
b0b74b6d97 Drone dispensers no longer trap the drones below them forcing ghosts to altclick (#34482) 
* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* I've got PRs to close, no time to wait on you
 2018-01-16 09:44:53 -05:00
Jordan Brown
fe0610f504 Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash 
Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 09:38:56 -05:00
Jordan Brown
5d045ff54a Merge pull request #34484 from F-OS/patch-8 
Ash storms are no longer so LOUD inside buildings.
 2018-01-16 09:38:02 -05:00
BordListian
451bd0d1ed Stray bullets and explosions don't blow up the entire syndi lava base anymore (#34401) 
* - Changes explosions to save a reference to the epicenter atom
- Changes syndicate bomb cores to have themselves as the epicenter, removing a redundant get_turf call
- Changes explosive plastitanium walls to only be triggered by bomb core explosions. This is a tad cumbersome but there's only 12 of these walls in the game.

* - Removes debug code

* - Can't hurt
 2018-01-16 09:35:57 -05:00
Jordan Brown
a53b1b560d Calling WEAKREF with a /datum/weakref returns the input (#34315) 2018-01-16 15:33:43 +01:00
Jordan Brown
603cc77136 Merge pull request #34475 from ShizCalev/internals-metal 
Makes tanks made of metal
 2018-01-16 09:33:19 -05:00
Jordan Brown
c20ae96884 Merge pull request #34478 from ChangelingRain/runtimefix 
Fixes a variety of runtimes that happen if a servant tries to access scripture without servants being properly active
 2018-01-16 09:32:00 -05:00
kevinz000
df559566cb Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside. (#34171) 
* Flash Refactor

* Update flash.dm

* Update flash.dm
 2018-01-16 15:30:03 +01:00
Jordan Brown
e300843c44 Merge pull request #34479 from F-OS/patch-5 
newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 09:29:12 -05:00
Jordan Brown
3a3c692d0d Merge pull request #34491 from Xhuis/the_lightbulb 
Adds a new bar sign, The Lightbulb (take 2)
 2018-01-16 09:27:14 -05:00
Jordan Brown
f1e7a3d070 Merge pull request #34455 from kevinz000/patch-435 
Fixes shuttle console negative auths needed
 2018-01-16 08:39:31 -05:00
Jordan Brown
a3d3c93fa3 Merge pull request #34463 from DaedalusGame/micro_fix 
Fixes duplicate reagents in chemistry macros
 2018-01-16 08:39:06 -05:00
Jordan Brown
683402c5f7 Merge pull request #34460 from AnturK/whyijustwastedhalfanhourlookingforatypo 
Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 08:38:27 -05:00
AnturK
332e7ca474 Makes getFlatIcon slower. (Also more precise) (#34199) 
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
 2018-01-16 08:32:35 -05:00
Iamgoofball
fc1bd6c8cc Super Surplus Crate 
Idea stolen from leddit
🆑 Iamgoofball, Anuvkh from Reddit
experimental: Super Surplus Crates are now available for 40 TC. They come with 125TC of shit. Have fun with teamwork!
/🆑
 2018-01-15 21:55:47 -08:00
Tad Hardesty
b3b3b38f34 Add JMP buttons to SDQL select results 2018-01-15 21:40:16 -08:00
Tad Hardesty
66f5459e88 Fix Camera Failure crashing the server if there are no cameras 2018-01-15 21:12:06 -08:00
uraniummeltdown
8d5030f3a7 rename all 'clown' to 'bananium' for bananium mineral objects (#34462) 2018-01-15 23:02:18 -05:00
kevinz000
1ee607fc2d Fixes mat container + emags (#34449) 2018-01-15 21:57:52 -05:00
Tad Hardesty
a9ced2ddcf Fix RPD embedding fixtures inside lattices and girders 2018-01-15 17:26:48 -08:00
Xhuis
77b4d36056 fixes hte mass recall not working 2018-01-15 20:07:55 -05:00
Tad Hardesty
5c85f18580 Combine and fix Show Air Status and Air Status in Location 2018-01-15 16:53:07 -08:00
XDTM
76b5ee3966 Xenobiology Species Rework (#34166) 
I've always found grating that xenobiology had access to species they had no business working with, and slime magic can only explain so much. My idea is to separate those species into their respective departments/antags, instead of having them all into a centralized, cheap source.

    Androids should be made by robotics through augmentation
    Podpeople are a botany feature
    Skeletons should be limited to liches or other magic antags
    Zombies should stay limited to romerol
    Golems are still available in adamantine slimes (and luminescents can morph into golems with them)
    Shadowpeople still lack an official place, but luminescents can become shadowpeople with black cores

The basic races are mostly human and lizard, and there are mutation toxins for those in case someone wants their species back after bodyswapping/ling mutation sting/etc.
 2018-01-16 11:07:06 +13:00
oranges
4e53bf5337 Merge pull request #34266 from KorPhaeron/goat 
Goats eat plant people
 2018-01-16 10:54:20 +13:00
oranges
11f6544f35 Merge pull request #34489 from ShizCalev/lightbulbrevert 
Revert: Adds the Lightbulb bar sign (#34480)
 2018-01-16 10:48:53 +13:00
MoreRobustThanYou
9ab6865f87 Greyscale wirecutters (#34385) 
* Greyscale Wirecutters!

* WOOPS!

* Hopefully make the colors lighter.

* hexcodes

* Fixy fixy

* Add files via upload
 2018-01-15 16:15:58 -05:00