cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 23:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,739 Commits 61 Branches 14 Tags
ec8db75ebd8e0c6ac3dbceaec2ea57b71165cb0c
Commit Graph

14056 Commits

Author SHA1 Message Date
KorPhaeron
ec8db75ebd Push block 2016-02-24 15:02:48 -06:00
AnturK
978a18d476 Merge pull request #15699 from KazeEspada/cockroachpushing 
Tiny mobs can't push shit.
 2016-02-24 14:26:16 +01:00
AnturK
2dca4811b6 Merge pull request #15686 from Menshin/bot_patrol_fixes 
Bots patrol/summons tweaks and fixes
 2016-02-24 14:11:09 +01:00
Razharas
e9a347289b Merge pull request #15681 from PKPenguin321/patch-13 
Tweaks stun/teleprod tablecrafting recipes
 2016-02-24 14:47:31 +03:00
Remie Richards
abf466e9bc Merge conflict fixes, Uses newly refactor actions, All cursed hearts can now be inserted by hand, not just wizard ones. Fixes organ actions trying to be granted to the object, not the user. 
Merge branch 'master' of https://github.com/tgstation/-tg-station into cursed_heart

Conflicts:
	code/modules/surgery/organs/organ_internal.dm
 2016-02-24 02:33:22 +00: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
tkdrg
377f187d53 Merge pull request #15691 from phil235/CigaretteMsgFix 
Fixes a mistake in visible_message() code. Turf calling visible_messa…
 2016-02-23 18:48:55 -03:00
tkdrg
b408ecc067 Merge pull request #15697 from AnturK/memes_cannot_be_denied 
Fixes mass modify for file type.
 2016-02-23 18:47:32 -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
Cheridan
2901f3d8f0 Merge pull request #15684 from KorPhaeron/snowdin 
Removes die of fate from snowdin
 2016-02-23 01:48:03 -06:00
Cheridan
b7d4e62100 Merge pull request #15668 from CosmicScientist/fixes_ss 
Fixes rechargeable e-gun language
 2016-02-22 21:59:45 -06:00
Remie Richards
f7cda70a6e Adds disconnect protection, I guess I'm not *that* mean. 2016-02-23 03:29:28 +00:00
KazeEspada
c130d04dfc Tiny mobs can't push shit. 2016-02-22 18:51:46 -07:00
Robustin
408a302b20 Update uplink_item.dm 2016-02-22 17:23:47 -05:00
Robustin
b26337dc05 Update uplink_item.dm 2016-02-22 17:00:52 -05:00
AnturK
d282727fd5 Fixes mass modify for file type. 2016-02-22 22:42:41 +01:00
Robustin
f31cc6e6cf Update uplink_item.dm 2016-02-22 16:31:44 -05:00
Robustin
c535ea783e Update human.dm 2016-02-22 16:28:42 -05:00
Robustin
d9c6dfce73 Update mob_helpers.dm 2016-02-22 16:27:28 -05:00
KorPhaeron
b56b079ef9 Merge pull request #15669 from AnturK/hivelordcore 
Fixes hivelord core healing
 2016-02-22 13:56:28 -06:00
phil235
c424dfbcf9 Fixes a mistake in visible_message() code. Turf calling visible_message() now work correctly. 
Fixes lighting cigarette message not appearing.
 2016-02-22 20:46:19 +01:00
Robustin
320b1e958c Update mob_helpers.dm 2016-02-22 13:24:08 -05:00
tkdrg
2f17bc0e2d Merge pull request #15645 from KorPhaeron/darby 
Cursed Russian Revolver
 2016-02-22 14:47:08 -03:00
Menshin
5533b54a0e * Cleaned bot patrol/summon logic regarding pathing retries 
* Splitted navbeacons global list in several z_level lists
* Fixes navbeacons and deliverybeacons global lists being erased when a navigation beacon was destroyed
 2016-02-22 17:56:34 +01:00
Cheridan
c1f17f6cbf Merge pull request #15662 from tkdrg/ILOVETOPIC 
Sanitizes a bunch of num inputs to be integers
 2016-02-22 10:32:15 -06:00
Cheridan
9766395322 Merge pull request #15355 from tkdrg/yeah 
Improves admin counting for irc
 2016-02-22 01:27:43 -06:00
KorPhaeron
72c4becd95 Removes die of fate from snowdin 2016-02-21 23:25:04 -06:00
Cheridan
d6d8f59db4 Merge pull request #15445 from Shadowlight213/Syndieboom 
Fixes away mission loot station balance by removing loot drops from syndicate simple mobs.
 2016-02-21 23:15:47 -06:00
PKPenguin321
8f2b3afd29 tweaks stun/teleprod tablecrafting recipes 
removes the cell requirement from both, now you can craft one without a battery (but have to manually add the battery afterwords)
also changes the teleprod tablecrafting recipe to be consistent with the stunprod
 2016-02-21 19:16:35 -08:00
Remie Richards
9401eb6b7d Added a wizard version of the heart, it heals the user every pump and only requires pumping every 6 seconds (vs 3) 
Pumping successfully now returns half of the blood lost from a missing pump (anymore and I doubt you'd die)
You can no longer spam the pumping (healing made this a requirement)
 2016-02-22 02:25:04 +00:00
Cheridan
56d68ce31f Merge pull request #15614 from CPTANT/staminabuffnew 
buffs stamina regeneration take 2
 2016-02-21 20:12:44 -06:00
Cheridan
050d6f4070 Merge pull request #15636 from Buggy123/patch-19 
Dice of fate is now reusable
 2016-02-21 20:11:26 -06:00
tkdrg
3ad21db02f Merge pull request #15647 from Boredone/master 
Fixs Breach Slugs Magazines
 2016-02-21 22:16:34 -03:00
Joan Lung
8109c83033 Merge pull request #15643 from tkdrg/old 
VV path edit will now use spawn-style dialogs
 2016-02-21 20:12:20 -05:00
Remie Richards
1263e341a3 Adds a "Cursed Heart", a heart where you have to manually pump blood or you die. 2016-02-22 01:03:53 +00:00
Joan Lung
b08f6d9c22 Merge pull request #15624 from phil235/DwarfFix 
Fixes being able to become huge with genetics
 2016-02-21 19:29:51 -05:00
phil235
91839f5f70 Action buttons will now only update when needed instead of every Life(). 
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
 2016-02-22 00:34:59 +01:00
AnturK
3e067441cd Fixes hivelord core healing 2016-02-21 20:46:29 +01:00
CosmicScientist
b8a62ea54b removes an unnecessary s 2016-02-21 19:28:49 +00:00
Tkdrg
c8c0f5294f Sanitizes a bunch of num inputs to be integers 
This is mostly to plug href exploits causing wacky stuff like NaN.
 2016-02-21 12:15:37 -03:00
tkdrg
4cf728cd5e Merge pull request #15642 from AnturK/random_things 
Minor fixes
 2016-02-21 10:21:13 -03:00
Joan Lung
ab658b9e24 Merge pull request #15628 from PKPenguin321/patch-13 
[s] Fixes nasty cleanbot bug
 2016-02-20 17:47:46 -05:00
Boredone
40005aca32 Hope I didn't mess up here as I didn't branch off earlier changes. 2016-02-20 15:34:01 -07:00
tkdrg
001b575898 Merge pull request #15151 from CPTANT/laserfire 
Laser beams may now set you on fire
 2016-02-20 19:19:22 -03:00
KorPhaeron
f0554d432d Excess whitespace removal 2016-02-20 15:22:27 -06:00
KorPhaeron
0acaebb844 Cursed Revolver 2016-02-20 15:20:12 -06:00
Tkdrg
4390482fac Merge branch 'Shadowlight213-Soundflip' into HEAD 
Closes #15502
 2016-02-20 16:00:11 -03:00