cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 12:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,479 Commits 60 Branches 14 Tags
aca0cd453aaac86df3cc366ca9ef764d6b6091f2
Commit Graph

24257 Commits

Author SHA1 Message Date
Jordan Brown
47ed29cb5b Merge pull request #35514 from ShizCalev/ghost-role-syndi-access 
Fixes wrong ID for syndicate ghost roles
 2018-02-11 16:34:17 -05:00
AnturK
c3c9f4c668 Highlander antag datum (#35519) 
* Highlander antag datum

* Forgot debug line

* Also this
 2018-02-11 16:32:06 -05:00
vuonojenmustaturska
9715ae359e The chef is also a cook (#35417) 
* just a lowly, lowly cook

* come on, that's not striking an officer
 2018-02-11 16:25:37 -05:00
Kyle Spier-Swenson
c9aa8d140d Fix sql error 2018-02-11 12:14:09 -08:00
Shadowlight213
68deef263a Removed admin requirement for the notify chat command (#35501) 2018-02-11 13:44:44 -05:00
ShizCalev
360780ae8b Fixes scaner circuit typo (#35508) 2018-02-11 13:42:56 -05:00
Leo
4beaee6a5f Merge pull request #35502 from Tlaltecuhtli/patch-1 
pet carriers can be actually made
 2018-02-11 11:34:07 -02:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456) 
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
 2018-02-11 16:06:12 +13:00
Dax Dupont
8c0ccad278 Grabbers can now only contain things smaller than the assembly. (#35462) 
* Grabbers can now only contain things smaller than the assembly

* Good suggestion buggy

* fucking github broke
 2018-02-10 19:08:52 -05:00
Dax Dupont
f658044e9b Adds the fake honking emag to the arcade. (#35457) 
* Adds the fake honking emag to the arcade

* duuu

* Henk

* it's fake now

* Merge branch 'master' of https://github.com/tgstation/tgstation into prank

* How the fuck would replacing wirecutters with an emag even work

* saddsadsdsadsdsaadgfdsgghf

* k
 2018-02-10 19:03:51 -05:00
Mokiros
61fd8fecbc Buildable and upgradable All-In-One Grinder (#35451) 
Circuit is in "Biological Processing" techweb node
 2018-02-10 19:00:06 -05:00
Jordan Brown
e94a105bca Ruins now log to world only in TESTING mode (#35421) 
* Ruins now log to the game log instead of the runtime log

* Remove it entirely

* Use TESTING
 2018-02-10 18:52:21 -05:00
uraniummeltdown
ac9964be70 Buildable Shuttle/Plastitanium Windows (#35376) 
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
 2018-02-10 18:49:43 -05:00
KorPhaeron
1270132798 Mining sentience upgrade grants minebots a radio and ID (#35235) 
* Minebots get mining radio+ID card

* Updates radio implant paths
 2018-02-10 18:39:58 -05:00
MoreRobustThanYou
53422e4088 Adds a SCP-294 ruin (#35188) 
* Add a SCP-294 ruin

* Convert map to TGM

* Add hostile mobs, random traps

* Add nanites

* Now now, we don't wanna blow ourselves up, do we, Jimmy?

* Blacklist blob chems

* make it harder

* Remove statue; use can_synth; name finder

* Fixup scp_294.dmm

* Fix traps

* Fix traps

* Add to POI list

* TGM-ize

* ruin remap

* damn tags

* Re-add mimics and traps

* New sprites by @militaires!

* Fix trap spawners spawning ctf protection thingys

* map fixes

* New sprite!
 2018-02-10 18:39:27 -05:00
Kyle Spier-Swenson
aad3bddffc [s]Blacklists the most recent version of byond for basically being a wall hack (#35516) 
* Blacklisted client builds.

* Missed a spot

* glob was a mistake
 2018-02-11 10:36:27 +13:00
ShizCalev
9dfeb83ebd others 2018-02-10 15:24:58 -05:00
ShizCalev
09ddb0000c Fixes wrong ID for syndicate ghost roles 2018-02-10 14:06:32 -05:00
Jordan Brown
f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup 
Replaces some var values with defines
 2018-02-10 12:10:40 -05:00
Jordan Brown
99c1a11e5d Merge pull request #35479 from Cruix/chem_collisions 
Fixed chemical recipe conflicts
 2018-02-10 12:04:18 -05:00
Trevor Serpas
db5173f896 Integrated Circutry Readability Improvements (#35449) 
* Integrated Circutry Readability Improvements

* support for old save files and fix a var I missed
 2018-02-10 11:04:34 -05:00
Ordonis
7470e79c2c Switched nitrogen for ethanol in morphine recipe. (#35437) 
* Fixes Ordo not testing shit properly

* Lowers yield for balance purposes

Fug
 2018-02-10 11:00:01 -05:00
Ashe Higgs
da961200f0 Fixes button lock not saving (#35465) 2018-02-10 10:58:06 -05:00
Tlaltecuhtli
5104413ff8 makes this shit actually buildable 2018-02-10 08:45:24 +01:00
Jordan Brown
8bfe0df2dd Removes uneedful code 2018-02-09 14:23:00 -06:00
Dax Dupont
4b75dd8b50 Hatchets are now small instead of tiny. 2018-02-09 14:22:24 -06:00
Jordan Brown
9eaa717778 Cell blueprints now use the /empty variants (#35463) 
* Cell blueprints now use the /empty variants

* Add empty stock cell
 2018-02-09 13:50:19 -05:00
Jordan Brown
54caf8b21a Merge pull request #35452 from 81Denton/crush-a-can-for-jay-owen 
Removes grind_results from empty soda cans
 2018-02-09 09:44:19 -05:00
Jordan Brown
63a7018fb5 Merge pull request #35453 from 81Denton/aluminium-with-two-i 
Aluminium with two i
 2018-02-09 09:44:10 -05:00
Jordan Brown
ebcac584df Merge pull request #35454 from DaxDupont/You-didn't-have-to-smile-at-me,-Your-grin's-the-sweetest-that-I've-ever-seen,But-you-did.-Yes-you-did 
Adds defib to techwebs
 2018-02-09 09:43:43 -05:00
vuonojenmustaturska
1c656f0e08 Merge pull request #35446 from 81Denton/can-synth 
can_synth uses TRUE/FALSE
 2018-02-09 10:41:15 +02:00
vuonojenmustaturska
9131022a9a Merge pull request #35476 from AutomaticFrenzy/patch/goliath-hide 
Fix goliath hide plates not applying to suits correctly
 2018-02-09 10:26:13 +02:00
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
Jordan Brown
724719c34a Merge pull request #35405 from MrStonedOne/fixterry 
Fixes job exp updates hounding the database more than it needed to.
 2018-02-09 00:05:27 -05:00
Jordan Brown
ca3976fc1d Merge pull request #35435 from optimumtact/mrtyhasahorsecunt 
Revert "Adds the saltmine shuttle. (#35369)"
 2018-02-09 00:03:36 -05:00
Tad Hardesty
e6ba6e17cf Fix goliath hide plates not applying to suits correctly 2018-02-08 19:08:58 -08:00
Ian Turk
a524466853 Fixed chemical recipe conflicts 2018-02-08 19:36:11 -06:00
Robustin
7dee5379d7 Cult fixes and UI improvement (#35178) 
* Blood spell fixes and UI improvement

* Bastard sword bug

* Update blood_magic.dm

* woops parenthesis

* Update blood_magic.dm

* space
 2018-02-09 14:10:50 +13:00
Jordan Brown
a3d9133016 Merge pull request #35419 from kevinz000/patch-446 
fixes beam rifle zooming
 2018-02-08 16:18:29 -05:00
PKPenguin321
d1c1a28128 adds italian moustache that makes you italian (#35426) 
* makes the moustache make you italian

* Revert #34916

* fixes travis i think

removes duplicate replace

* puts the mask on by default, undoes dynamic-a speech-a

rip

* removes unneeded varedits

saves 2 lines woo
 2018-02-08 15:29:23 -05:00
vuonojenmustaturska
1c8e450f15 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 12:21:06 -05:00
81Denton
7a06bcb4a0 removes grind_results 2018-02-08 16:42:03 +01:00
Dax Dupont
8490b1560a Adds defib to techweb 2018-02-08 16:22:38 +01:00
Jordan Brown
6b90cc824a Merge pull request #35410 from ShizCalev/ai-loc-fix 
Fixes primary AI spawning at incorrect locations
 2018-02-08 10:04:33 -05:00
Jordan Brown
211dd43a68 Merge pull request #35412 from DaxDupont/flags-are-for-fags 
Brings certain designs in line with others.
 2018-02-08 10:03:51 -05:00
81Denton
fa4dce2943 part 2 2018-02-08 15:43:44 +01:00
81Denton
24d60d8f32 corrects aluminium 2018-02-08 15:32:27 +01:00
81Denton
718e50548e true/false 2018-02-08 11:16:20 +01:00
Iamgoofball
10a24645c6 Adds basic trailer support to vehicles (#35388) 
* Adds basic trailer support to vehicles

* Move compat.
 2018-02-08 22:21:42 +13:00
Dax Dupont
fc3ad5dc66 SM can explode on space tiles again (#35275) 
* Reordered some of the SM logic

* make it a little slower

* It does not explode instantly i tested
 2018-02-08 22:12:56 +13:00