cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-06 15:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,172 Commits 60 Branches 14 Tags
91c92c788cbf2a629cf88972704fd9d2d5844a4e
Commit Graph

9111 Commits

Author SHA1 Message Date
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
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
Xhuis
c7aa8c1f32 Fixes infinite heartbeat sounds 2017-07-04 13:46:48 -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
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
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
MoreRobustThanYou
8280b63985 Fixes deathgasping while being cloned (#28949) 2017-07-01 18:11:53 -03: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
Ergovisavi
4ab451e6ab More leaper fixes 2017-06-30 17:23:29 -07: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
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
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
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
Tacolizard
848690e5b8 Adds heartbeats (#28858) 
* beatz

* use defines

* comments

* start refactor

* refactor 2

* finish refactor

* fix

* Update misc.dm

* Update life.dm

* Update heart.dm

* Update heart.dm

* remove human checks

* move things around

* woops

* wew

* update lowest sound channel

* remove stopsound

* get_turf
 2017-06-28 15:01:04 -04:00
Ian Turk
5277bf18c9 Fixed ghosts not seeing alternate appearances 2017-06-28 09:06:41 -06:00
Jordan Brown
3fb988c9c7 Swarmer cleanup 2017-06-28 11:05:49 -04:00
Leo
ac96764660 Merge pull request #28851 from Cyberboss/RevertBorers 
Removes cortical borers
 2017-06-28 10:33:51 -03:00
Leo
bd15d54452 Merge pull request #28868 from AnturK/changeling-monkey-fix 
Fixes lings losing organs on humanization
 2017-06-28 10:31:25 -03:00
Joan Lung
21541a4c86 Tweaks how ash drake shadows look at the beginning and end of swoops 2017-06-27 21:13:45 -04:00
Joan Lung
d165ecc6f2 Rethemes the Necropolis (#28857) 
* 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
 2017-06-27 18:49:30 -03:00
Leo
f8cad7c0f7 Merge pull request #28855 from lordpidey/lordpidey_devil_fixes 
Minor devil fixes.
 2017-06-27 18:23:29 -03:00
Matthew Walker
f3afd18551 Move eye_damage from /mob/ to eye organs (#28725) 
* First test change, only damage

* take out unused var

* null check

* First test change, only damage

* take out unused var

* null check

* Fixes some wizard stuns (#28693)

* First test change, only damage

* take out unused var

* null check

* review changes

* Hate git
 2017-06-27 16:51:29 -04:00
Jordan Brown
d8388e261f Merge pull request #28856 from Xhuis/straight_jacket_fix 
Straight jackets can now properly be put onto others
 2017-06-27 16:33:28 -04:00
Leo
3757ef5943 Merge pull request #28850 from GunHog/Malf_Shell_Fix 
Fixes AI <-> Shell mind transfer issues
 2017-06-27 12:29:36 -03:00
Jordan Brown
99a1e92364 Merge pull request #28841 from Ergovisavi/muh_crystal 
Some fixes for the anomalous crystal
 2017-06-27 09:12:46 -04:00
AnturK
d3bf259d9d Fixes lings losing organs on humanization 2017-06-27 09:18:15 +02:00
Leo
2e0bf10a30 Merge pull request #28822 from ChangelingRain/hierophantfix 
Fixes the Hierophant's walls runtiming
 2017-06-26 17:58:42 -03:00
Leo
2824b6e7e3 Merge pull request #28821 from kevinz000/patch-231 
Fixes PAIs deleting their card on death
 2017-06-26 17:54:34 -03:00
Xhuis
e7a98978fd Fixes straight jackets 2017-06-26 12:39:28 -04:00
Mike Long
4185f8959f Fixes bugs in devil 
Fixes devils not losing souls upon resurrection,.
Fixes spells appearing deactivated upon resurrection.
Fixes unascendable devils being able to get ascension grade spells.
 2017-06-26 12:30:59 -04:00
Jordan Brown
ef96559701 Removes cortical borers 2017-06-26 11:21:08 -04:00
kevinz000
30f27ffbc4 Fixes the AI core being flammable (#28814) 2017-06-26 11:38:02 -03:00
GunHog
14e3b9a7c2 Fixes AI <-> Shell mind transfer issues 
- Fixed Traitor/Malf AIs resetting their antagonist status and points
upon transfering to a shell and back.

- Fixes connected borgs being shown their laws when the AI returns to
its shell.
 2017-06-26 09:37:25 -05:00
Ergovisavi
2a7e4f1d6c Some fixes for the anomalous crystal 2017-06-26 00:24:37 -07:00
Joan Lung
70e712017e Status effects start processing immediately instead of on the next timer subsystem tick (#28747) 
* Status effects start processing immediately instead of on the next timer subsystem tick

* let's fix this while we're at it

* hup

* not technically efficient but better than not updating when needed
 2017-06-25 12:47:10 -04:00
kevinz000
195518b0c9 Update death.dm 2017-06-25 09:37:17 -07:00
Joan Lung
8fae499bb2 Fixes the Hierophant's walls runtiming 2017-06-25 12:20:36 -04:00
Steelpoint
f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584) 
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
 2017-06-25 12:02:31 -04:00
Leo
f754700a33 Merge pull request #28686 from optimumtact/assessthread 
Refactors threat assessment for security bots
 2017-06-24 16:50:46 -03:00