cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,848 Commits 61 Branches 14 Tags
bcc030be176b937fee339cc1525259a67e65cef3
Commit Graph

17431 Commits

Author SHA1 Message Date
PKPenguin321
bcc030be17 finally makes the button work 2016-08-23 16:10:39 -07:00
PKPenguin321
7234a84ba7 bjkajkjbks 2016-08-22 19:10:01 -07:00
PKPenguin321
9413a55511 aaaaaaa 2016-08-22 18:30:14 -07:00
PKPenguin321
74682a6617 Merge branch 'master' of https://github.com/tgstation/-tg-station into alien-queen-giga-toggle 
# Conflicts:
#	icons/mob/actions.dmi
for real this time
 2016-08-22 18:14:56 -07:00
Joan Lung
844ed6786b Merge pull request #20007 from Ergovisavi/power_of_the_power_of_the 
Replaces the fireball book in the Drake chest with a book of Sacred Flame
 2016-08-22 21:02:51 -04:00
PKPenguin321
8182f558fe fixes 
- makes the background of the button the right color
- fixes the runtime (but the button still doesnt work properly)
 2016-08-22 17:58:24 -07:00
Ergovisavi
642f79bb59 Replaces the fireball book in the dragon chest with a book of sacred flame, a new spell. 2016-08-22 17:44:14 -07:00
PKPenguin321
de16b9a1cc adds alien queen sprite toggle 2016-08-22 17:35:04 -07:00
oranges
02726667f9 Merge pull request #19901 from Incoming5643/topdoc 
Converts medibot's lines to soundfiles
 2016-08-23 09:22:23 +12:00
oranges
f3d50a23a0 Merge pull request #20043 from lzimann/chamgear 
Fixes chameleon gear not working
 2016-08-23 09:21:39 +12:00
Lzimann
6cc89a2bc3 fixing goof's shit 2016-08-22 18:17:54 -03:00
oranges
5c957b3893 Merge pull request #19996 from ChangelingRain/ididntstartthatfireimayhavestartedotherfiresbutididntstartthatoneandifididstartthatfireitwasanaccidenthonest 
Plasmamen no longer die instantly to the wizard cursed items event
 2016-08-23 09:08:53 +12:00
oranges
c6987fbfa7 Merge pull request #19995 from lzimann/patch-14 
Crafting menu now opens on compact mode by default
 2016-08-23 09:08:24 +12:00
oranges
fc14827f70 Merge pull request #19994 from ChangelingRain/touchisaphantomthingthatyoucantstandfromsomanypeopleandwantsomuch 
Drakes will use fire rain instead of fire walls if using a ranged attack while swooping
 2016-08-23 09:08:05 +12:00
Leo
4efe1d20b6 Adds an actual bow to the game (#19990) 
* Initial bow commit

* Finishes bow.

* Adds a quiver and some other bow stuff

* Fix conflicts

* Dot dot

* Use false instead of !ready_to_fire

* Remove unecessary ifs.
 2016-08-23 09:07:17 +12:00
ExcessiveUseOfCobblestone
ac5bde1a7f Removes Partial Credits for Already Discovered Seeds + MoneyTree Potency Edit (#19975) 
* Nerfs Seeds & Money Trees

* give them the D

* REMOVE IT ALL

* Update seeds.dm
 2016-08-23 09:06:59 +12:00
Joan Lung
60070e5d2e Merge pull request #20011 from Jalleo/WhatGoofSays 
Does what goof says in the solution to a few OP chems
 2016-08-22 15:37:52 -04:00
Joan Lung
9a4ae5cd1f Merge pull request #19993 from Ergovisavi/tells_and_readability 
Attempts to stop Bubblegum's charge indicator from being wildly inaccurate
 2016-08-21 21:52:06 -04:00
Joan Lung
e2d33dd611 Moves a bunch of copypasted megafauna vars to the base type (#19984) 
* moves a bunch of copypasted megafauna vars to the base type

* copy pasta

* five more ounces

* hmm why would I do that hmmmmm
 2016-08-22 08:48:43 +12:00
Cruix
f406e518cc Fixed some possible runtimes with pollCandidates() (#19919) 
* Fixed some possible runtimes with pollCandidates()

* Fixed bug in pollCandidatesForMobs()
 2016-08-22 08:45:22 +12:00
blah
b78cf51016 Adds other ones to the blacklist 2016-08-21 20:43:03 +01:00
blah
fffa1b4dc5 Merge branch 'master' of https://github.com/tgstation/-tg-station into WhatGoofSays 2016-08-21 20:00:21 +01:00
blah
8639c60679 One line fix to prevent this admin chem from being seriously duplicated. 2016-08-21 19:54:59 +01:00
AnturK
67fec5891f Merge pull request #19981 from MrStonedOne/TargetPractice 
Makes ListTargets() much much faster.
 2016-08-21 19:54:54 +02:00
Kyle Spier-Swenson
1440cd8e87 Adds a list() 2016-08-21 10:43:46 -07:00
Cheridan
84522e7573 Merge pull request #19955 from KorPhaeron/auxbasefix 
Fixes aux base breaking to space
 2016-08-20 23:25:59 -05:00
Jordie
63d17d8a59 Merge pull request #19963 from Shadowlight213/nsmecheck 
Adds the ability for admins to lookup the name, ckey and antag status of a player from irc.
 2016-08-21 12:22:13 +10:00
Joan Lung
77eac1e009 Merge pull request #17818 from Shadowlight213/Fixbundle 
Fixes appearance bans and changes to logout message in check antags
 2016-08-20 22:20:38 -04:00
Joan Lung
7bf05eec58 Plasmamen no longer die instantly to the wizard cursed items event 2016-08-20 21:16:27 -04:00
Leo
eeb928edb1 Compact mode by default 2016-08-20 21:50:11 -03:00
Joan Lung
daf67c0ca8 fire rain only 2016-08-20 20:28:38 -04:00
Joan Lung
d930839a77 Drakes will no longer use fire walls while swooping 2016-08-20 20:26:51 -04:00
Ergovisavi
16fb2e1571 Attempting to make Bubblegum's charge actually accurate to the on the ground placement 2016-08-20 17:01:58 -07:00
Cheridan
7d9ef1af55 Merge pull request #19970 from Iamgoofball/patch-107 
Fixes medigun description
 2016-08-20 16:56:47 -05:00
Joan Lung
dc460c518f Merge pull request #19964 from KorPhaeron/config 
Replace health config with damage multiplier config
 2016-08-20 17:09:01 -04:00
kevinz000
0dc5adf907 dungoofed. (#19979) 2016-08-20 13:20:52 -05:00
MrStonedOne
e9ea58ebf7 Makes listTargets() much much faster. 
````
/mob/living/simple_animal/hostile/proc/ListTargetsG    42.008      118.524      118.559       195594
/mob/living/simple_animal/hostile/proc/ListTargetsF    27.078       42.788       42.813       195267
/mob/living/simple_animal/hostile/proc/ListTargetsE    32.423       48.520       48.540       195401
/mob/living/simple_animal/hostile/proc/ListTargetsD    46.633      118.919      118.938       195455
/mob/living/simple_animal/hostile/proc/ListTargetsC    63.589       90.622       90.646       195630
/mob/living/simple_animal/hostile/proc/ListTargetsB    62.156       88.851       88.880       195159
/mob/living/simple_animal/hostile/proc/ListTargetsA   382.978      383.049      383.087       195578
/mob/living/simple_animal/hostile/proc/ListTargets      4.748      895.996      896.142      1368084
````
i went with E because F had a few edge cases that weren't handled correctly.
 2016-08-20 06:15:18 -07:00
Joan Lung
b3ba027969 Merge pull request #19958 from lzimann/removespell 
Adds remove spell proc to the View Variables dropdown menu.
 2016-08-19 20:38:41 -04:00
Shadowlight213
e6146d7739 [S] Fixes deadchat bugs (#19972) 
* Fixes an exploit that bypassed deadchat bans.
Adds global deadchat toggle as requested by mso.
Adds some feedback on if dead ooc was turned on or off for admins.

* Fix only
 2016-08-19 17:06:08 -05:00
Shadowlight213
c6e6dcb4ef wording fixes 2016-08-19 13:35:10 -07:00
Shadowlight213
0fb4757512 Fixes 
Appearance_PERMABAN type removed. now a jobban
Added needed updating to the sql changelog
 2016-08-19 13:31:15 -07:00
Iamgoofball
5bc7fbd7f0 MCFLT 2016-08-19 12:12:59 -07:00
Iamgoofball
1818f3781c Fixes medigun description 2016-08-19 12:06:49 -07:00
KorPhaeron
eb39ca8e6e Kinetic Accelerator Mods (#19942) 
* KA Mods

* Better examing

* Removes excess returns

* WHY indeed

* Updates projectiles properly

* Removes or replaces old hyper KA stuff

* Nerfs cooldown mod
 2016-08-19 21:04:25 +12:00
Shadowlight213
98114703e8 Modular computers changes (#19928) 
* Fixes and documentation.

* WIp on laptop vendor

* some fixes
 2016-08-19 21:03:10 +12:00
Ergovisavi
f163c9e525 Changes to the fulton pack (#19944) 
* Consolidated the fulton packs into one pack
* Allows you to fulton yourself by directly attaching it to yourself
* Consolidated the mining voucher fulton kits into one kit
 2016-08-18 23:07:33 -05:00
Shadowlight213
5f15792126 Merge branch 'master' of https://github.com/tgstation/tgstation into Fixbundle 2016-08-18 19:47:20 -07:00
Joan Lung
61cff4e7bc Merge pull request #19940 from KorPhaeron/summons 
Summon Magic now functions like summon guns
 2016-08-18 22:31:02 -04:00
Jordie
8d62df91c3 Readds irradiate failure to nuclear gun on EMP (#19915) 
* readds irradiate failure to nuclear gun

* adds overlay proc and bases failure chance to 0
 2016-08-18 21:13:12 -05:00
KorPhaeron
074bc50fb4 Damage Multiplier Config 2016-08-18 20:19:19 -05:00