cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-11 01:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,107 Commits 60 Branches 14 Tags
2eaef38534a9dd9ab05c8f3e073f4110be67ebda
Commit Graph

21626 Commits

Author SHA1 Message Date
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
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
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
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
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
Jordan Brown
503a20119b Merge pull request #28892 from nicbn/revert-28577-freezer_heater_fix 
Revert "Freezers and heaters now drop the correct materials"
 2017-06-29 00:54:24 -04:00
Jordan Brown
048c531952 Merge pull request #28893 from optimumtact/rankup 
Remove the R_REJUVINATE flag and replace with R_POLL
 2017-06-29 00:53:15 -04:00
Jordan Brown
b1eb2cb8c6 Merge pull request #28894 from optimumtact/erro 
Do not use your brain, do not look at the code, do not engage me
 2017-06-29 00:52:39 -04:00
kevinz000
fecfe42d80 Update wormholes.dm (#28895) 2017-06-29 00:50:38 -04:00
Jordan Brown
875fa3ac61 Fix IRC server check 2017-06-29 00:48:04 -04:00
Jordan Brown
f820f4a087 Makes IRC pm use ckey() on target 2017-06-28 23:24:59 -04:00
KorPhaeron
6be19bc4e4 Katana 2017-06-28 19:12:38 -04: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
Shadowlight213
c9d2c2bd8d Ports bay's supermatter monitor modular program (#28635) 
* WIP

* How the hell did these not get committed

* Fixes, icons for the tablet

* Laptops use the static engine overlay when running the program.
Engineering tablets now start preloaded with a supermatter monitor and alarm monitor.

* Defines

* Requested changes.
Engineering tablets no longer have preinstalled programs.
Supermatter status percents are defines

* Minor thing
 2017-06-28 11:05:09 -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
AnturK
f771ea7082 Fixes emergency shuttle endgame state (#28870) 2017-06-28 10:30:59 -03:00
kevinz000
e227760e80 Makes virology window larger (#28866) 2017-06-28 09:27:55 -04:00
oranges
fef015feb0 Do not use your brain, do not look at the code, do not engage me 2017-06-28 02:44:22 +00:00
oranges
8ef47216a5 Remove the R_REJUVINATE flag and replace with R_POLL 
Rejuvenation lives under R_ADMIN and R_POLL is a new flag you can grant
to someone to allow them to create polls
 2017-06-28 02:38:00 +00:00
nicbn
a362a991fa initialize .=.. 2017-06-27 23:35:51 -03:00
nicbn
0f710f70c6 Revert "Freezers and heaters now drop the correct materials (Fixes #28560)" 2017-06-27 23:10:19 -03:00
Jordie
27276ca3bb Readds percentagecalc as default_display_in_results (#28840) 
* readds percentagecalc as default_display_in_results with a prompt explaining what it actually does

* default 1

* tabsplz

* Update database_changelog.txt

* Update tgstation_schema.sql

* Update database_changelog.txt

* Update tgstation_schema_prefixed.sql

* Update create_poll.dm
 2017-06-27 21:43:49 -04: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
bbbdb4986f Merge pull request #28764 from KorPhaeron/mesonrevert2 
Mesons work on lavaland again
 2017-06-27 18:26:04 -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
Really-Good-Soda-Flavor
930b15e625 Adds container types INJECTABLE and DRAWABLE (#28853) 
* Adds container types INJECTABLE and DRAWABLE

* Make the chemistry readme a text file and updates it!

* Unfucks the readme!

* Another attempt at fixing the readme

* Remove the readme from the .dme

why was it a dm file!!
 2017-06-27 09:19:25 -04: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