cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 02:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

2293 Commits

Author SHA1 Message Date
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
Fox-McCloud
d3a615acd4 Fixes Sleeping Carp Grabbing 2016-02-11 21:42:17 -05:00
Nerd Lord
26837bef6b Fixes basic martial arts not checking the species punch stun threshold. 2016-02-11 12:26:50 -05:00
Fox-McCloud
53f17613b3 Gibbing Throws Internal Organs 2016-02-11 08:19:57 -05:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc 
Fix a number of runtimes
 2016-02-10 23:50:38 -06:00
Akke
8170f2113d if(!affected_mob.reagents.has_reagent(C_id)) 2016-02-10 22:50:31 +00:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
 2016-02-10 22:35:19 +01:00
Akke
0ab8e7213f Adds Viral adaptation and evolution 2016-02-10 19:11:23 +00:00
Akke
00eba3168d updates to dunc and kaze's suggestion 2016-02-10 18:21:20 +00:00
Akke
26c944b7e0 Adds var/needs_all_cures 2016-02-10 18:04:44 +00:00
Bjorn Neergaard
265b8d2d20 Fix an air alarm runtime 
Don't store hard refs to an area which can cause race condtions
Instead, get our area only when we need it

The following runtime has occured 4426 time(s).
runtime error: Cannot read null.atmosalm
proc name: update icon (/obj/machinery/airalarm/update_icon)
  source file: airalarm.dm,535
  usr: null
  src: the alarm (/obj/machinery/airalarm)
 2016-02-10 07:01:24 -06:00
Bjorn Neergaard
f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
phil235
83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping) 
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
 2016-02-07 18:50:18 +01:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard
ddab6823d3 Fix up crates 
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
 2016-02-07 01:20:37 -06:00
Bjorn Neergaard
ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -06:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
 2016-02-06 15:42:13 +01:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
9386602acf tgui cargo console 
rewrite awful shuttle/cargo code a lot as well
 2016-02-05 17:06:07 -06:00
tkdrg
7651557bdb Merge pull request #15196 from AnturK/wasteremoval 
Removes unused debug datum
 2016-02-05 14:57:33 -03:00
tkdrg
ffa51f8f0d Merge pull request #15162 from xxalpha/getareas 
Fixes wizarditis teleport
 2016-02-05 01:39:04 -03:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510 
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
 2016-02-04 17:19:40 -06:00
AnturK
c8862a0c23 Removes unused debug datum 2016-02-04 17:23:53 +01:00
phil235
16d0154d9f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 2016-02-04 17:04:10 +01:00