cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-11 17:35:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,472 Commits 61 Branches 14 Tags
d17d66f5a31001b6264d60e8b59052d6da3bc300
Commit Graph

38931 Commits

Author SHA1 Message Date
AnturK
d17d66f5a3 Adds wigs (#31304) 
* Adds wigs

* spaces to tabs

* Move up
 2017-10-05 10:23:06 -04:00
Jordan Brown
3aeb8b363a Merge pull request #31310 from ShizCalev/lobby-timer-fix 
Fixes lobby timer showing as delayed when it's just waiting for more players
 2017-10-05 10:21:14 -04:00
Leo
f6a3354498 Merge pull request #31294 from YPOQ/sciencetoolfix 
Fix abductor scientist being unable to use science tool
 2017-10-05 08:49:00 -03:00
Leo
cda74780d8 Merge pull request #31290 from YPOQ/jaunterfix 
Fixes jaunters chasm-saving feature
 2017-10-05 08:47:31 -03:00
oranges
f700cb6331 Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 21:05:16 +13:00
oranges
5ccbcd28d7 Merge pull request #31296 from ShizCalev/landmark-cleanup 
Cleans up and fixes old landmarks
 2017-10-05 21:04:20 +13:00
oranges
d81facca85 Merge pull request #31269 from Firecage/doublehardsuitrebalance 
Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
 2017-10-05 21:01:19 +13:00
Ashe Higgs
3f5696f91d Lizzers and plasmamen can now be servants of Ratvar (#31244) 
* Removes racial discrimination from Ratvar's servants

* Activates plasma internals; thank you Y0SH1M4S73R!

* Update clock_cult.dm
 2017-10-05 21:00:06 +13:00
JJRcop
2ab85e231b Moved admin music volume slider to its own menu (#31277) 
* Moved admin music volume slider to its own menu

* Minor fixes to goonchat
 2017-10-05 20:58:49 +13:00
Emmett Gaines
e16fd1b151 Makes shuttle movement a bit smoother and faster (#31255) 
* uses CHECK_TICK where it's acceptable

* cleanup
 2017-10-05 09:30:32 +02:00
RandomMarine
9dff229cd9 Experimental fix for bloom issue (#31299) 2017-10-05 00:24:01 -04:00
Supermichael777
f770b69d5b Makes the pda font a prefernce (#31193) 2017-10-04 21:28:44 -03:00
Leo
bc6ef6619c Merge pull request #31284 from tgstation/Cyberboss-patch-1 
Code cleanup in snack_meats.dm
 2017-10-04 21:26:38 -03:00
Leo
6d08ebac83 Merge pull request #31287 from ShizCalev/wizard-name 
Correctly applies wizard names
 2017-10-04 21:26:19 -03:00
Leo
85d717350d Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 21:25:31 -03:00
Leo
4ffb1cdd0e Merge pull request #31289 from ShizCalev/hacknslash 
Makes the energy katana swwwwwwish when drawn
 2017-10-04 21:24:44 -03:00
oranges
b8ea267866 Merge pull request #31281 from vuonojenmustaturska/clowncult 
Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
 2017-10-05 11:54:45 +13:00
ShizCalev
cddcbe3e4f Fixes shaking people up while buckled into a bed/resin nest (#31283) 
* Fixes shaking people up when buckled into bed

* CB
 2017-10-05 11:00:27 +13:00
oranges
a47dc83a1b Merge pull request #31275 from kingofkosmos/moredeconhints 
Adds deconstruction hints to various things
 2017-10-05 10:33:09 +13:00
kevinz000
94bb5beef5 Preliminary blast cannon cleanup (#31264) 
* Update blastcannon.dm

* Update blastcannon.dm

* Update blastcannon.dm
 2017-10-05 10:32:13 +13:00
ShizCalev
61854f7825 Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150) 
* Hides ninja socks, draining updated to DisplayPower

* CB

* KEEP_TOGETHER
 2017-10-05 10:29:19 +13:00
oranges
134bbd1223 Merge pull request #31238 from AnturK/specialeyes 
Space vision fix V2.0 - GAME_PLANE change
 2017-10-05 09:13:41 +13:00
JJRcop
f8951911b1 Hosts can lock config options from admins (#31254) 
* Hosts can lock config options from admins

* Optimization of LoadEntries

a very very very small one
 2017-10-05 08:58:55 +13:00
kevinz000
12b845fcd4 Update projectile.dm (#31180) 2017-10-05 08:50:42 +13:00
kevinz000
aeadbceb27 why plus a minus value and not just minus the value... (#31279) 
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
 2017-10-04 14:02:44 -05:00
Jordan Brown
fdfc4137ee Merge pull request #31245 from Robustin/swordfix 
Fixes Cult 2H Sword Soulshards
 2017-10-04 14:02:26 -04:00
Jordan Brown
32050bed01 Moves laughter to the emote (#31276) 2017-10-04 13:19:18 -04:00
bawhoppen
9b7f1ada6b Moves all stack object sprites from items_and_weapons.dmi to their own file (#31273) 
* keeko

* forgot the file
 2017-10-04 12:59:27 -04:00
Jordan Brown
95f79435e7 Dummies used for preference setup always compile overlays (#31267) 2017-10-04 12:03:32 -04:00
ExcessiveUseOfCobblestone
9d3dcfbc55 Fixes Carpsie nullrod from being invisible (#31268) 2017-10-04 11:59:44 -04:00
ShizCalev
93dba11648 Simplified further 2017-10-04 10:37:51 -04:00
ShizCalev
63554ed392 Fixes lobby timer showing as delayed when its not 2017-10-04 10:27:27 -04:00
Leo
85b9ba1497 Merge pull request #31256 from ShizCalev/zombie-toxin 
Zombies regen toxin damage
 2017-10-04 08:14:47 -03:00
Leo
571b5072ea Merge pull request #31261 from AnturK/lockedslot 
Fixes species locked slots alpha.
 2017-10-04 08:11:42 -03:00
vuonojenmustaturska
2ccaee1723 Makes gutlunches hungry for gibs again (#31241) 
* gutlunch fix

* combine ifs, removes unneeded check
 2017-10-04 11:11:24 +02:00
ninjanomnom
436bffbb77 move shuttleRotate into the shuttle module 2017-10-04 02:54:13 -04:00
ShizCalev
0ae5cd2d97 Cleans up and fixes old landmarks 2017-10-03 23:38:59 -04:00
YPO
8f787a68f1 Fix abductor scientist being unable to use science tool 2017-10-03 21:34:23 -06:00
ShizCalev
c5b4213e28 Makes the energy katana swwwwwwish when drawn 2017-10-03 20:27:46 -04:00
oranges
4881c712fc Merge pull request #31237 from Cyberboss/STAPIUpdate 
Server tools API update to 3.1.0.1
 2017-10-04 12:47:28 +13:00
YPO
935a5497a4 Merge branch 'master' into jaunterfix 2017-10-03 17:44:45 -06:00
Armhulen
d75eb9cd1c Gives nightmares a random shadowling name (#31188) 
* fuck you ruined my !ONE COMMIT PR!

* !ONE COMMIT PR!
 2017-10-04 12:40:53 +13:00
ShizCalev
e4a9de46dd Correctly applies wizard names 2017-10-03 19:25:53 -04:00
KorPhaeron
085632fa63 Nightmare organs (#31034) 
* Heart of Darkness

* Forgot the desc

* I'm not good at typing

* Apparently hearts dont actually stop on death

* Sounds

* Special brain

* Fixes being ghosted when turned into a nightmare

* Define

* Typo

* Fixes shadow walk not clearing stuns

* Less hacky brain transfer
 2017-10-04 12:20:59 +13:00
AnturK
72f711cc70 Fixes mech fab runtime (#31232) 
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
 2017-10-04 12:18:58 +13:00
YPO
b9b86afd06 Fixes jaunters chasm-saving feature 2017-10-03 17:16:49 -06:00
XDTM
6ed612ce77 Adds the advanced medical scanner, gives one to the CMO (#31179) 
* Adds the advanced medical scanner, gives one to the CMO

* MORE SCAN DOC

* dots
 2017-10-04 12:15:43 +13:00
oranges
47a74d8cf3 Merge pull request #31135 from KorPhaeron/unconvertable 
Adds a var to minds that makes them immune to conversion
 2017-10-04 12:14:32 +13:00
Supermichael777
fc4a9799ef Fixes stealth nerf to detectives gun (#31125) 
* Fixes stealthnerf to detectives gun

Having knockdown healed stamina damage, but also needed stamina too keep you down. This rectifies the extra stamina healing

* WEW LADS
 2017-10-04 12:13:41 +13:00
KorPhaeron
72389743db ismachinery define 2017-10-03 18:13:21 -05:00