cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 06:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,472 Commits 61 Branches 14 Tags
b2d1cb332ec856437dd5ff91082052c545a55b0b
Commit Graph

2752 Commits

Author SHA1 Message Date
Cheridan
688e8b57b8 Merge pull request #21926 from KorPhaeron/shuttles 
Allows adding prerequisites to purchasing shuttles
 2016-12-04 20:48:26 -06:00
Joan Lung
551ede6d35 Kills all remaining text pronoun macros (#21916) 
* Kills all remaining text pronoun macros

* review your own code

* oh right one further

* more

* \
 2016-12-04 21:32:31 +01:00
KorPhaeron
c9dcd95473 Shuttle Requirements 2016-12-03 19:38:38 -05:00
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill
c2e2440953 Merge branch 'master' into w_class 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
 2016-12-02 21:44:24 -08:00
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux 
Remove slash from end of type refs/defs
 2016-12-03 15:56:10 +11:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Cheridan
89d3752276 Merge pull request #21584 from RemieRichards/swarmer_boss 
Adds a new boss: Swarmer Swarm [Now a Ruin]
 2016-12-01 07:47:54 -06:00
Joan Lung
a5ae025549 Replaces "specflags" with "species_traits" (#21851) 
* Replaces "specflags" with "species_traits"

* this will do
 2016-12-01 21:16:33 +13:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
oranges
c2295b8f21 Merge pull request #21841 from MrStonedOne/sadface 
Fixes some shit that was annoying me about configs.
 2016-12-01 12:12:59 +13:00
MrStonedOne
f75bfacb30 Fixes some bugs/runtimes. Makes vv var formating use less strings. 2016-11-30 12:50:16 -08:00
MrStonedOne
c1f8543487 Adds some dropdown options to lists 
I was gonna make it so you could mark lists, but too much code assumed they had a .type and adding the proper istypes to them was too bloaty.
 2016-11-30 12:50:16 -08:00
MrStonedOne
1f8d998600 Improvements and fixes 2016-11-30 12:50:15 -08:00
MrStonedOne
76e1c6916f VV refactor 2016-11-30 12:49:21 -08:00
Mervill
b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
MrStonedOne
62177b2734 Fixes some shit that was annoying me about configs. 
Code files are less of an issue, but I have to ferry the config across linux and windows, and I don't want to have to care about the case of shit on the linux side.
 2016-11-28 21:49:45 -08:00
Cyberboss
ae03c035a2 Fixes a negative sqrt 2016-11-28 16:30:48 -05:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
Remie Richards
e95fa57f3a Swarmer Boss is now in a Ruin (Cost 20) 2016-11-25 17:58:49 +00:00
Remie Richards
c2d9c849b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into swarmer_boss 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2016-11-25 17:14:20 +00:00
Cyberboss
e37f807941 Fixes the false armblade removal timer. Refactors addtimer (#21714) 
* Clever girl...

* Make the addtimer unique param safe

* Refactor addtimer calls

* Moved the location of the define so the other SSs can use it
 2016-11-25 22:05:58 +13:00
kevinz000
87dbd65811 [READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860) 
* vroom

* wew

* a

* b

* morestuff

* .

* a

* .

* .

* basicsprites+extend/retract

* ...

* .

* thanks travis

* woops

* thankstravisv2

* redundence

* ishouldstopmakingsomanygoddamncommits+empdamage

* stuff

* ..

* ion_trails

* fixes_conflict_1

* fix

* compilesnow

* .

* fuck

* WIP: Multi Step Assembly

* thismightfixitthismightnot

* shoe-attachment

* noselfremoval

* wooops

* tweaksandcrashing

* runtimes

* runtimesfuntimes+crash update 1

* thisprobablywontcompile

* stillwip

* githubPLEASEWORK

* fixes conflicts 3/3

* REFACTORSUNTESTED

* fixingconflicts2

* fixingconflicts3/3

* updates

* stuffs

* ...

* stillWIP

* stufffs

* .

* ..

* runtimesfuntimes2

* stuffs2

* conflictfix

* ...

* fuck

* fix

* bah merge conflicts

* knockback_testing1

* conflictfixing...

* mergeconflicts

* plop

* socloseyetsofar

* tweaksandfixes

* conflicts

* fix

* fixes

* fix

* woops

* woops2

* hotfix

* ...

* flufftextandfixes

* test

* ..

* fix1/2

* stuff

* finallysomeoneteachesmehowtofixthisshit

* FIX

* why

* .

* bitflagsshitflags1

* bitflags-shitflags2

* bitflags-shitflags2

* bitflags_shitflags_4

* autofloating

* minerbuffgetthepun?

* notouchingfloors

* ...

* .

* f l o a t

* kek

* kek

* fixes

* fixes2

* sprites
 2016-11-25 13:26:43 +13:00
Joan Lung
22c159ad3e Replaces the 'no cache' alert with an alert showing what you need for the next tier (#21689) 
* Replaces the 'no cache' alert with an alert showing what you need for the next tier

* please make a base
please

* this can't be more dynamic, no

* duh, I can do this

* much better

* i'm just kor but with clocks
 2016-11-25 13:25:56 +13:00
oranges
f0806cd368 Merge pull request #21647 from KorPhaeron/buildyourownshuttle 
Allows captains to organize a shuttle build event
 2016-11-25 10:13:53 +13:00
Joan Lung
6f2c8bc9f4 Fixes internals buttons (#21696) 
* Fixes internals buttons

* i'm very happy with my own ui tbh
 2016-11-24 21:20:32 +01:00
oranges
3c7f7582f1 Merge pull request #21680 from KorPhaeron/lavabase2 
Syndicate Lava Base Remap
 2016-11-24 10:28:57 +13:00
Joan Lung
e86d782625 Merge pull request #21639 from AnturK/fancybuttons 
Makes action buttons use the hud themes.
 2016-11-22 16:25:42 -05:00
KorPhaeron
3c769285e4 Syndicate Lava Base Remap 2016-11-21 20:37:05 -06:00
Leo
cc0071e720 Adds a config file to enable/disable shuttles from being bought (#21642) 
* Adds a config file to enable/disable shuttles from being bought

* Remove useless comment
 2016-11-22 11:53:51 +13:00
Joan Lung
f53fc311e6 Clockcult AIs get the ability to listen in through cameras (#21643) 2016-11-22 11:52:34 +13:00
pubby
7d9c7ec44f PubbyStation bugfixes (#21637) 
- fix disposalpipe in brig
- fix missing chapel light
- fix cargo sec filing cabinet
- fix science scrubber pipe
- add station maps
- add atmos waste line
 2016-11-22 11:48:56 +13:00
Cheridan
8696a4381b Merge pull request #21621 from ExcessiveUseOfCobblestone/patch-2 
Hot-Tweak for Radstorms, Shuttle Boogaloo
 2016-11-20 12:06:33 -06:00
Joan Lung
5224512d55 Replaces Servant cyborg emagged modules with some limited scripture and tools (#21632) 
* Replaces Servant cyborg emagged modules with some limited scripture and tools

* not THAT limited

* sorry standard borg

* bugfix
 2016-11-20 17:51:11 +01:00
KorPhaeron
b3baa8314c Build your own shuttle 2016-11-19 15:28:25 -06:00
AnturK
b2ff4cfd33 Makes action buttons use the hud themes. 2016-11-19 14:05:06 +01:00
KorPhaeron
594e34576e Syndicate Lavabase Ruin (#21550) 
* Syndicate Base

* Secret Base

* Forgot a file

* Gives the base red floors and syndie walls

* Fixes compile errors

* Makes sure you can't steal the bombs

* Adds some uranium
 2016-11-19 13:44:34 +13:00
ExcessiveUseOfCobblestone
758380f87a Hot-Tweak for Radstorms, Shuttle Boogaloo 
Radstorms would magically teleport to lavaland with the shuttles, so instead of trying to stupidly write L O R E as to why this occurs  I just figured to make the mining shuttle [this includes gulag shuttle as well] radproof.
 2016-11-18 00:11:35 -05:00
Remie Richards
0a74ca8b41 Feedback Round 1: 
- Two new Swarmer classes, Melee and Ranged Combat Swarmers
- The Swarmer cap is now 60
- The Swarmer Beacon will replenish swarmer numbers up to 50% of the total swarmer cap (up from 20% of it)
- Fixed the Swarmer beacon chasing and nuzzling people
 2016-11-17 23:14:11 +00:00
kevinz000
caeec1da09 . 2016-11-17 00:19:09 -08:00
Joan Lung
e662f5d5b1 Clockcult AIs no longer require APC power (#21552) 
* Clockcult AIs no longer require APC power

* some, maybe?
 2016-11-17 12:29:49 +13:00
Joan Lung
d691faba1b Clockcult Cyborgs can charge from Sigils of Transmission (#21558) 
* Clockcult Cyborgs can charge from Sigils of Transmission

* better

* rip
 2016-11-17 12:29:21 +13:00
Joan Lung
f162d4d84a Refactors scripture quickbind (#21563) 
* Refactors scripture quickbind

* =
 2016-11-17 12:28:57 +13:00
pubby
d1010a7d53 Emergency storage protects from rad storms (#21565) 2016-11-17 12:28:47 +13:00
Shadowlight213
7619752290 Fixes sqrt of a negative number and null blood dna runtimes (#21562) 2016-11-17 12:28:32 +13:00
KorPhaeron
615ead8530 Pubby Shuttle Doesn't Work 2016-11-15 12:25:15 -06:00
KorPhaeron
3221c630c5 Adds the luxury shuttle, adds descriptions to other shuttles 2016-11-13 22:31:28 -06:00
KorPhaeron
0435d7ae01 Asteroid Shuttle 2016-11-13 13:15:36 -06:00
KorPhaeron
ac065db80f Captain can buy a new escape shuttle (#21398) 
* Captain can buy a new escape shuttle

* A messy way to fix/avoid the issue

* Hopefully fixes potential href exploit

* Makes the code better so oranges wont yell at me anymore
 2016-11-11 10:22:46 +13:00
Shadowlight213
c2d0cf3066 Allows the possible roundstart random AI laws to be customized in config. (#21414) 2016-11-10 09:27:57 +13:00