cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-30 19:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,172 Commits 59 Branches 14 Tags
91c92c788cbf2a629cf88972704fd9d2d5844a4e
Commit Graph

21657 Commits

Author SHA1 Message Date
Shadowlight213
91c92c788c Gives ghost roles their own assigned_roles (#29044) 
* Gives ghost roles their own assigned_role in mind.

* vars

* skeleton
 2017-07-05 20:45:48 -04:00
Jordan Brown
59bbd429ef Merge pull request #29039 from ChangelingRain/keynameadminuser 
Fixes the legion door admin report/logging
 2017-07-05 16:40:46 -04:00
Jordan Brown
70abaeee64 Merge pull request #29036 from Xhuis/heartbeat_fix 
Fixes heartbeat sounds playing indefinitely in certain cases
 2017-07-05 16:40:22 -04:00
Steelpoint
c3b00bce43 [Ancient Station] First Round Of Changes/Additions (#28843) 
* InitialCommit

* BannersAndFixes

* NewChanges

* FinalChanges

* InitializeFix

* Typo

* MinorFixes

* MoreFixes
 2017-07-05 00:22:16 -04:00
MoreRobustThanYou
aa7c60eb1f Ports plasma glass windows from /vg/ (#29024) 
* add plasma window textures

* plasma glass sheets

* Update glass.dm

* Update window.dm

* Whoops!

* Update glass.dm

* Update glass.dm

* UHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH

* this is what I get for coding while being awake for nearly 24 hours

* SMOOTHIES

* Update window.dm

* return return RETURN

* who cares

for some reason paperframes had trues and all that... i hate byond

* updated dmi snoothie thins

* Add files via upload

* thanks @Cyberboss- thump... zzzzzzzzzzz

seriously i am so tired right now

* AYYYy yayyy I SAID YEAHHHH, what's GOIN ONN

* Update glass.dm

* EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

* ooga booga

* Update window.dm

* Update smelting_designs.dm

* Update smelting_designs.dm

* Update glass.dm

* Update window.dm

* Update glass.dm

* reee

* WHOOPS!

* Well, if ya say so

* Update glass.dm

* Update glass.dm

* uhhh....?

* Update window.dm

* Update glass.dm

* Add files via upload

* Update window.dm

* Update glass.dm
 2017-07-04 22:27:58 -04:00
PKPenguin321
2d599e1b97 Adds the circle game (#28961) 
* adds the circle game
- adds an inventory sprite to weapons.dmi
- adds the code for the hand "object" to weaponry.dm
- adds emote datum code for making your hand a circle to emote.dm

* fixes
- makes sure the emote is actually ran before creating objects
- qdels the new object if it fails to get placed into the mobs hand

* adds a message to the user when emote fails

* added special examine reactions
- added new proc to items.dm
- added handling for the proc in human/examine.dm
- added special examine reaction to the circled hand in weaponry.dm
- removed a check on the circle emote that made it not work in emote.dm

* defines, a fix

* undoes last two commits
 2017-07-04 22:25:51 -04:00
Joan Lung
b04ecfa6a2 hup 2017-07-04 15:42:22 -04:00
Joan Lung
3352767796 Fixes the legion door admin report/logging 2017-07-04 15:29:59 -04:00
Xhuis
c7aa8c1f32 Fixes infinite heartbeat sounds 2017-07-04 13:46:48 -04:00
Xhuis
a9f94cf44c Gives role checks to the Voice of God 2017-07-03 18:58:23 -04: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
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
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
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
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