cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 14:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,083 Commits 61 Branches 14 Tags
43ca8a63cc4e3ba90bf5702f2b3a72d191f789e7
Commit Graph

21612 Commits

Author SHA1 Message Date
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
Jordan Brown
d7e1eee8e0 Merge pull request #28914 from KorPhaeron/ninja 
Fixes ninjas not getting their katana
 2017-06-29 18:57:32 -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
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
Jordan Brown
e6abdde003 Merge pull request #28831 from p440/28745-modular_consoles 
Fix modular consoles
 2017-06-26 23:01:39 -04:00
Jordan Brown
2b35f59c61 Merge pull request #28834 from KorPhaeron/stompstompstomp 
Fixes the ancient suit from makings stomping noises in peoples hands
 2017-06-26 23:00:58 -04: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
Joan Lung
9dbe3253d0 Adds some neat tiles and walls for use on lavaland (#28760) 
* Adds some neat tiles and walls for use on lavaland

* heh

* these, too

* misflip
 2017-06-26 11:18:51 -03:00
kevinz000
226c0f1636 Fixes piggybacking giving person on top projectile density instead of the person on the bottom. (#28770) 2017-06-26 11:01:17 -03:00
KorPhaeron
060b767a47 Ninja Dash (#28644) 2017-06-26 10:57:12 -03:00
KorPhaeron
63ee5b9665 istype 2017-06-26 09:30:54 -04:00
Jordan Brown
ff574a0a1b Improves Ahelp feedback (#28782) 
* Improves Ahelp feedback

* Update adminhelp.dm
 2017-06-26 13:01:08 +02:00