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
31,436 Commits 61 Branches 14 Tags
4cb3a2b9be2f31e2ec3a42bec01ffabf6c3e965a
Commit Graph

2316 Commits

Author SHA1 Message Date
Cheridan
a65f02e917 Merge pull request #15993 from LanCartwright/virologymath 
Adds complex math to virology that scales with virus symptom stats.
 2016-03-12 23:36:01 -06:00
duncathan salt
e0d3ac1d28 Merge pull request #16050 from Dorsisdwarf/AIlaws 
Adds a series of new laws and boards
 2016-03-12 15:12:42 -06:00
duncathan salt
1692d5a01d Merge pull request #16022 from AnturK/ruin_fix 
Fixes ruins repeating
 2016-03-12 13:50:12 -06:00
Cheridan
ece18bc04b Merge pull request #16042 from Jordie0608/thereareseveralwaysthiscouldbreakbutfortunatelynoneofthemwouldbemyfault 
Show-server-revision tells if test pr is merged
 2016-03-12 11:53:51 -06:00
Dorsisdwarf
eec22d0ca4 Adds a series of new laws and boards 2016-03-11 19:58:59 +00:00
Jordie0608
c3f28bb395 show-server-revision tells if test pr is merged 2016-03-11 20:35:10 +11:00
duncathan salt
c5e6b2a23d Merge pull request #16012 from ChangelingRain/carpfeedback 
Sleeping Carp attacks now have attack animations
 2016-03-10 22:36:50 -06:00
AnturK
9531ff401a Fixes ruins repeating 2016-03-10 18:13:49 +01:00
Nerd Lord
21f04b36ff Sleeping Carp attacks now have attack animations 2016-03-09 22:53:19 -05:00
Akke
74df41cf02 re-nerfs heal.dm toxic filter to match current output. 2016-03-09 21:36:09 +00:00
Akke
bdfe977644 Adds math to virology. 2016-03-09 18:58:38 +00:00
Razharas
1745e8bc8e Merge pull request #15961 from ChangelingRain/toxicfilter 
Toxin Filter symptom no longer heals absurd amounts of damage
 2016-03-09 04:55:55 +03:00
Cheridan
c5653f28b6 Merge pull request #15963 from ChangelingRain/oneatatime 
Damage Converter symptom now does toxin damage for each limb healed
 2016-03-08 11:26:55 -06:00
Cheridan
2b414621bd Merge pull request #15929 from tkdrg/timmy 
Makes the admin add reagent list sorted
 2016-03-07 18:10:26 -06:00
Nerd Lord
7d72936f23 whybotherwithwaiting 2016-03-07 12:20:23 -05:00
Nerd Lord
d064a68254 actually the alternative is better 2016-03-07 12:08:01 -05:00
Nerd Lord
91e4ac0420 Damage converter symptom now only heals one limb at a time 2016-03-07 11:59:00 -05:00
Nerd Lord
a8fb2b9e76 Toxin Filter symptom no longer heals absurd amounts of damage 2016-03-07 11:44:03 -05:00
Tkdrg
af7e42c6f1 Makes the admin add reagent list sorted 2016-03-05 08:24:38 -03:00
Mike Long
27e781e3cf Corrected mistake. It now works with changelings too. 2016-03-05 03:12:00 -05:00
Mike Long
c0d678e18b Fixes the inexplicable runtime errors. 2016-03-05 02:50:34 -05:00
Mike Long
8eb7267030 Theoretically makes the new huds not runtime. 
In actuality, it just causes an UBSURD amount of runtimes on startup.  No clue why.
 2016-03-05 01:55:58 -05:00
Mike Long
12f4d11f7e Adds antag hud for traitors/changlings/abductors/abductees/ninjas 
Right now, it's admin only.

Has not been tested.
 2016-03-05 00:52:59 -05:00
Cheridan
ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo 
Remake of #15690. Replaces newcult with oldcult.
 2016-03-01 22:37:58 -06:00
tkdrg
9211b19b38 Merge pull request #15836 from phil235/SpellFix 
Fixes spell action button not being updated correctly
 2016-03-01 21:09:20 -03:00
tkdrg
4cc5754cd3 Merge pull request #15651 from lordpidey/projectile_vomit 
Added projectile vomiting symptom.
 2016-03-01 20:25:59 -03:00
phil235
563ef0cca8 Renamed remove_spell() to RemoveSpell() for consistency with AddSpell(). 2016-02-29 23:21:33 +01:00
phil235
3c8a9274bf Fixes spell action button not being updated correctly regarding zlevel and clothes requirements. The buttons are now always not red in these cases but clicking them give the proper fail message. 
Fixes blind AI (lack of power) staying blind if transfered to a mech or a card.
Fixes magboots action button icon not updating when toggling the boots on.
Fixes Area teleport spells not having a cancel button when choosing the destination area.
Fixes spell action button not being removed when the spell is refunded.
Fixes revenant spell action button icons not being updated when the revenant is inhibited by a null rod.
 2016-02-29 16:30:54 +01:00
Shadowlight213
f79b7bafcb Various fixes. 2016-02-27 18:30:32 -08:00
Shadowlight213
642321b5cd Removes newcult and readds oldcult 2016-02-27 00:53:14 -08:00
Cheridan
5223bd3230 Merge pull request #15768 from Core0verload/action_fix 
Action button icon fix
 2016-02-27 01:09:56 -06:00
Cheridan
af615e0997 Merge pull request #15429 from Fox-McCloud/gibbing-organs 
Gibbing Throws Internal Organs
 2016-02-26 21:34:26 -06:00
Cheridan
2dfebaa77e Merge pull request #15708 from KorPhaeron/sins 
Five lavaland ruins
 2016-02-26 08:46:32 -06:00
c0
f0e32522b9 Action buttons "on" generalisation 2016-02-26 07:34:23 +03:00
tkdrg
45fca87806 Merge pull request #15687 from AnturK/template_improvements 
Template loading improvements
 2016-02-25 16:29:10 -03:00
Remie Richards
4d1e3764e1 Merge pull request #15673 from phil235/ActionButtonUpdateRefactor 
Action buttons will now only update when needed instead of every Life().
 2016-02-24 02:01:15 +00:00
phil235
448ae3eeeb Fixes organ_action, they can now be named something other than "toggle [target.name]" 2016-02-24 02:49:47 +01:00
Razharas
746bbcf4ce Merge pull request #15696 from Robustin/MuhYakuzaEroticFantasy 
Traitors can buy former Sleeping Carp Scroll for 17TC
 2016-02-24 02:04:24 +03:00
phil235
57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi
 2016-02-23 19:49:38 +01:00
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions. 
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
 2016-02-23 19:37:42 +01:00
KorPhaeron
d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06:00
Remie Richards
ebc485e38a Merge pull request #15400 from LanCartwright/viraladaptation 
Adds Viral adaptation and evolution
 2016-02-23 04:03:16 +00:00
Robustin
9763db99de Update martial.dm 2016-02-22 16:20:10 -05:00
AnturK
07432da284 Fixes off-by-one errors. 
Adds template area preview
 2016-02-22 19:09:31 +01:00
phil235
9a18ce7a8e Fixes a message mistake of mine. 2016-02-22 01:23:29 +01:00
Mike Long
a3dc65bc74 Added projectile vomiting symptom. 2016-02-20 21:32:03 -05:00
phil235
887822edd5 Fixes being able to become huge by injecting yourself with dwarfism while having mutadone in you. The resizing now happens instantly and no longer waits for the next life() call. 
Fixes resizing. It was broken because I had removed update_canmove() call in living/life(). Now every part of the code that modifies resize directly calls update_transform().

Fixes mob seeing two messages when acquiring (or losing) the dwarfism mutation.
 2016-02-19 18:32:29 +01:00
AnturK
e5bfff0cc9 Merge pull request #15393 from LanCartwright/needsallcures 
Adds var/needs_all_cures
 2016-02-13 19:07:19 +01:00
tkdrg
53002ec035 Merge pull request #15444 from Fox-McCloud/martial-fix 
Fixes Sleeping Carp Grabbing
 2016-02-13 00:13:09 -03:00
tkdrg
313f2e9b41 Merge pull request #15431 from ChangelingRain/punchstun 
Fixes basic martial arts not checking the species punch stun threshold.
 2016-02-12 14:37:14 -03:00