cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,639 Commits 61 Branches 14 Tags
2814432f909402dcafe5cdccb6718f59d2ee1606
Commit Graph

9344 Commits

Author SHA1 Message Date
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
KorPhaeron
f9e5cb1460 Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit (#28708) 2017-06-24 16:48:28 -03:00
Joan Lung
deae811756 Unconscious and Knockdown are now status effects (#28696) 
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
 2017-06-23 12:00:49 -04:00
oranges
d6b323bcfa Refactors threat assessment for security bots 
They don't share a common ancestor type so they were relying on the
secbot having identical vars to the ed209, this is brittle and ugly, so
instead a bitflag of criteria is passed through the mob assess_threat
proc so it can choose how to react to each criteria

As well as that, the weaponscheck proc used by the bots is now passed
through as a callback, more things can now implement their own
weapons checking for threat assessment if they need

This means more things can now utilise the assess_threat proc if they so
wanted to, as they no longer need to map 1 -> 1 to the ed209's vars

Also fixed a runtime where the secbot didn't pass through itself to the
assess_threat proc (what I originally wanted to fix)
 2017-06-22 21:05:22 +00:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Joan Lung
58c054acb5 Stun is now a status effect (#28654) 
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
 2017-06-22 10:50:46 +10:00
Leo
930a96e198 Merge pull request #28636 from AnturK/random-runtime 
Fixes random runtime
 2017-06-21 09:46:28 -03:00
Kyle Spier-Swenson
491bdace5d Makes movement delay calculation not round to the tick (#28616) 
* Makes movement delay calculation not round to the tick

* Fix some fuckups

* How'd that get there

* With squash merging I don't have to feel ashamed about this commit message
 2017-06-20 21:04:41 -04:00
Jordan Brown
50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus 
Sleeping is now a status effect
 2017-06-20 16:22:34 -04:00
Lan
80380c59e7 Removes loot from Syndicate and Spaceport simple mobs. (#28123) 
* Removes loot from Syndicate simple mobs.

* That can go too

* That can go too

* adds del_on_death as remie requested

* added taps to TRUE
 2017-06-20 11:12:59 -04:00
Jordan Brown
1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore 
Refactors hitreaction to pass in the hitting atom
 2017-06-20 09:21:14 -04:00
AnturK
f5e636673b Short-circuiting doesn't work like this. 2017-06-20 11:58:43 +02:00
Jordan Brown
0234fede9e Merge pull request #28581 from ChangelingRain/fleshfrombone 
Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg
 2017-06-19 23:06:38 -04:00
oranges
186d17b77b Refactors hitreaction to pass in the hitting atom 
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
 2017-06-20 02:48:17 +00:00
Joan Lung
563f66700c Sleeping is now a status effect 2017-06-19 14:47:35 -04:00
Xhuis
27c665bfb5 Variable renames, some sets 2017-06-19 11:17:15 -04:00
Xhuis
2a31e44d95 Adds framework for equip delays 2017-06-18 23:24:39 -04:00
Joan Lung
cc3c809646 Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg 2017-06-18 23:10:25 -04:00