cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-05 22:43:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,142 Commits 60 Branches 14 Tags
70dcd2ea9b8e4b078f7fc7a6ccc33aee32fd4ffd
Commit Graph

37214 Commits

Author SHA1 Message Date
Joan Lung
70dcd2ea9b Clockcult conversion has more explicit logging in what did it (#29007) 
* Clockcult conversion has more explicit logging in what did it

* clang

* tweak
 2017-07-04 15:40:45 -04:00
kevinz000
de1281f458 Fixes PDA runtime href exploit (#28959) 2017-07-04 10:31:52 -03:00
Really-Good-Soda-Flavor
d23c6f910d Checks for temporary martial arts on mind transfer (#28746) 
* Checks for temporary martial arts on mind transfer

* Makes transferring its own proc

* Makes sure martial arts are qdeleted on removal

* Improves teaching and removing
 2017-07-04 11:34:05 +02:00
AnturK
a2b21ab93d Fixes pods not counting as escape (#28988) 2017-07-03 19:13:34 -03:00
Shadowlight213
6a5bb83d98 Makes cookie alert private (#29012) 2017-07-03 19:12:51 -03:00
Ashe Higgs
4a80a8fbe6 Rewrites Recollection and splits it into categories, rewords Hierophant Network description (#28711) 
* Rewrites Recollection

* Conflicts 1

* Typos and stuff!

* Capitalizes more stuff

* capitalizations, rewords, oh my

* Conflicts 1

* Conflicts 3 (and space!)

* More changes
 2017-07-03 11:09:47 -04:00
Jordan Brown
9a5a2a35aa Merge pull request #28966 from ChangelingRain/minerruins 
Actually adds the blood-drunk miner ruins
 2017-07-02 22:57:57 -04:00
Joan Lung
407e0e77e4 Ruin placement will try very hard to place any ruins with negative costs before attempting any other ruins (#28973) 
* Ruin placement will try very hard to place all 0-cost ruins before placing any ruins with actual costs

* comment

* account for ruin variants properly please

* cost has a cost of 5

* tweak
 2017-07-02 22:57:32 -04:00
Joan Lung
888b2e093e Makes the lavaland pressure check a proc (#28954) 
* Makes the lavaland pressure check a proc

* code that probably did nothing tm

* sss

* 50 should be a define instead
 2017-07-02 20:14:42 -04:00
Jordan Brown
e116ceec10 Merge pull request #28974 from JamieH/patch-1 
Remove sanitize_ooccolor
 2017-07-02 20:10:22 -04:00
Supermichael777
f29a038d71 DNA syringe gun damage down to 'sane' from revolver (#28975) 
* Fixes a bug

* This didnt do what I thought it did
 2017-07-02 19:02:04 -03:00
Ergovisavi
f5d800a06d Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero 
# Conflicts:
#	icons/effects/96x96.dmi
 2017-07-01 16:20:05 -07:00
Leo
bf72887e38 Merge pull request #28903 from Cyberboss/swarmerfix 
Swarmer cleanup
 2017-07-01 18:14:54 -03:00
Leo
685dba0f5a Merge pull request #28930 from Cyberboss/cardboardtubes 
Fixes cardboard tube duping
 2017-07-01 18:14:13 -03:00
Leo
19abbab8cd Merge pull request #28962 from Xhuis/gun_reskin_fix 
Fixes reskinned guns being invisible
 2017-07-01 18:13:20 -03:00
MoreRobustThanYou
8280b63985 Fixes deathgasping while being cloned (#28949) 2017-07-01 18:11:53 -03:00
Jordan Brown
5b66f2f1b2 Speeds up SSoverlays (#28933) 2017-07-01 15:55:11 -03:00
JamieH
2eaef38534 Remove sanitize_ooccolor 2017-07-01 17:07:04 +01:00
Joan Lung
98508c9236 Merge pull request #28946 from lzimann/holo 
Changes the holodeck to use tgui, plus some code refactor/improvements
 2017-07-01 11:56:57 -04:00
Joan Lung
f6ad5996f3 Rethemes the ash walker nest to match the Necropolis (#28886) 
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks

* Rethemes the ash walker nest to match the necropolis

* fix some issues with the door version

* whoops

* run mapmerge tgm, does not tgm

* whoops

* whoops, all dirs

* tgm

* The bonfire has a grill

* nah just do what ergo wanted
 2017-07-01 11:39:31 -03:00
Joan Lung
53cbfc20b3 Chasms, asteroid turfs, basalt, and lava can no longer be made wet (#28951) 2017-07-01 11:38:17 -03:00
Ergovisavi
1a118c0651 Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero 
# Conflicts:
#	icons/effects/96x96.dmi
 2017-06-30 21:31:32 -07:00
Ergovisavi
c51ac78421 More leaper stuff 2017-06-30 21:16:44 -07:00
Joan Lung
5ab0992bbb slightly more huntery 2017-06-30 23:24:01 -04:00
Joan Lung
be746c1946 Actually adds the blood-drunk miner ruins 2017-06-30 23:20:16 -04:00
Joan Lung
a110e881ad Adds the blood-drunk miner as a potential mining "mini" boss (#28829) 2017-06-30 22:39:49 -03:00
Ergovisavi
5c5c7b7470 Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution (#28730) 2017-06-30 22:38:30 -03:00
Lzimann
fdce8da565 Changes the holodeck to use tgui, plus some code refactor/improvements 2017-06-30 21:27:55 -03:00
Ergovisavi
4ab451e6ab More leaper fixes 2017-06-30 17:23:29 -07:00
Ashe Higgs
044fa0ea45 Cleans up godclash code (#28939) 
* Cleans up clash code, adds sound_to_playing_players

* Removes some debug code

* z-level check

* Removes an old thing

* Cyberboss changes

* changes @ maintainer request
 2017-06-30 20:03:40 -04:00
Jordan Brown
24de3629fb Merge pull request #28941 from optimumtact/bananaphone 
use_power var now uses a define to reflect it not being a bool
 2017-06-30 19:28:30 -04:00
MoreRobustThanYou
a0e6b52a5c Port can opening from /vg/ (#28936) 
* Create drinks.dm

* Update drinks.dm

* Delete drinks.dm

* Update drinks.dm

* PORT SOUNDS FROM /vg/

* POP!

* nope

* Update drinks.dm

* Update drinks.dm

* why was attack_self there twice?

* Update drinks.dm

* Update drinks.dm

* GLOB GLOB GLOB

* Update sound.dm

* Update drinks.dm

* Update drinks.dm

* Update drinks.dm

* Update drinks.dm

* Lid is NOT soda specific, right?
 2017-06-30 17:19:11 -04:00
Xhuis
e1b0f6328c Fixes reskinned guns being invisible 2017-06-30 16:05:59 -04:00
Jordan Brown
d15fc09188 Merge pull request #28932 from MrStonedOne/patch-388 
Show ban id to banned players
 2017-06-30 15:22:43 -04:00
Jordan Brown
14dc306697 Merge pull request #28928 from MrStonedOne/patch-387 
Fix the lobby menu not showing when the mysql connection had ghosted
 2017-06-30 13:12:29 -04:00
Jordan Brown
43ca8a63cc Merge pull request #28924 from ChangelingRain/drakeshadowtweak 
Tweaks how ash drake shadows look at the beginning and end of swoops
 2017-06-30 10:19:38 -04:00
Tacolizard
bd28d98c62 Heartbeat fix (#28916) 
* fix

* Update life.dm

* add repeat

* fix

* Update heart.dm

* TRUE
 2017-06-30 10:17:31 -04:00
Leo
369a6a6fa7 Merge pull request #28920 from tgstation/Cyberboss-patch-2 
Fix IRC server check
 2017-06-30 11:08:06 -03:00
Jordan Brown
bd1cf1f9cd Merge pull request #28919 from MrStonedOne/patch-386 
Makes the status throttle much more sane.
 2017-06-30 08:51:51 -04:00
Leo
b210c87195 Merge pull request #28918 from tgstation/Cyberboss-patch-1 
Makes IRC pm use ckey() on target
 2017-06-30 00:21:25 -03:00
oranges
ae3740d84b use_power var now uses a define to reflect it not being a bool 
NO_POWER_USE
IDLE_POWER_USE
ACTIVE_POWER_USE

holopads now correctly set use_power and the active_power_usage
 2017-06-29 23:50:16 +00:00
Jordan Brown
d7e1eee8e0 Merge pull request #28914 from KorPhaeron/ninja 
Fixes ninjas not getting their katana
 2017-06-29 18:57:32 -04:00
Kyle Spier-Swenson
4318caa102 Show ban id to banned players 
So we can look up what ban is matching and other details like roundid.
 2017-06-29 11:22:01 -07:00
Jordan Brown
917ca588a8 Fixes cardboard tube duping 2017-06-29 14:13:18 -04:00
GunHog
980089dad6 Holodeck Silicon Check 
It was possible to emag the holodeck as a non-silicion without an emag.
 2017-06-29 13:05:13 -05:00
Jordan Brown
d48a483353 Merge pull request #28906 from Cruix/ghost_better_alternate_appearances 
Observers can see through some alternate apperances
 2017-06-29 13:38:46 -04:00
Kyle Spier-Swenson
55ae89560b Fix the lobby menu not showing when the mysql connection had ghosted 
somebody was copypasting boilerplate code.
 2017-06-29 08:52:18 -07:00
Ergovisavi
999282e9d8 Junglestation frog mob take 1 2017-06-29 07:30:18 -07:00
Jordan Brown
722fee5a18 Merge pull request #28899 from ChangelingRain/stunfixfixfixfix 
Fixes the Unconscious status effect not updating stat
 2017-06-29 09:35:09 -04:00
oranges
0dfa3d8aa2 Adds a database versioning schema table (#28897) 
* Adds a database versioning schema table

All it does right now is warn admins when the version in the db gets behind
the defined version in the compile options file

This also moves the db connection warning messages to the
CheckSchemaVersion proc in world, out of the roundid proc
as it's the first db proc called in a world round

* Update database_changelog.txt

* Update tgstation_schema.sql

* Update tgstation_schema_prefixed.sql
 2017-06-29 16:47:17 +10:00