cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 06:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,806 Commits 61 Branches 14 Tags
722252e7bb4d5a2b603e33ae9502ebac0345b4e9
Commit Graph

14087 Commits

Author SHA1 Message Date
Cheridan
722252e7bb Merge pull request #15739 from CosmicScientist/fixes_armour_penetration 
Prevents armour from absorbing penetration
 2016-02-26 12:39:35 -06:00
Cheridan
2dfebaa77e Merge pull request #15708 from KorPhaeron/sins 
Five lavaland ruins
 2016-02-26 08:46:32 -06:00
Cheridan
d80756ce9e Merge pull request #15745 from KazeEspada/TreeCutting 
Tree cutting
 2016-02-26 08:40:29 -06:00
Cheridan
2d9619446f Merge pull request #15733 from phil235/ClosetAIFix 
The AI's core no longer fits inside regular closets
 2016-02-26 08:37:57 -06:00
Cheridan
3028684042 Merge pull request #15736 from CosmicScientist/riot_armour_description 
Buffs riot armour
 2016-02-26 05:31:01 -06:00
Iamgoofball
872fa7acf0 >fuck up the pathing >it's all over now 2016-02-25 17:45:09 -08:00
Iamgoofball
3f9bd8586f >add the chameleon kit >test everything but uplink 
>it didn't work

🆑 Iamgoofball
bugfix: The Chameleon Kit is actually purchasable now. It doesn't give a single chameleon jumpsuit anymore.
/🆑
 2016-02-25 17:40:42 -08:00
AnturK
a73fcf5414 Merge pull request #15717 from KazeEspada/Plasamemeforrealz 
Humans and monkeys now breath all of the gas in their breath.
 2016-02-25 23:10:56 +01:00
tkdrg
45fca87806 Merge pull request #15687 from AnturK/template_improvements 
Template loading improvements
 2016-02-25 16:29:10 -03:00
KazeEspada
8aeb2678e0 You can now cut down trees! You can use anything sharp to do so, and it will produce 10 logs. The more force the item has, the faster it cuts. 2016-02-24 23:15:19 -07:00
Joan Lung
80c9101892 Merge pull request #15661 from AndrewJacksonThe2nd/PARANOIA 
A TEAM OF NUKEOPS DISGUISED AS THE HEADS OF STAFF
 2016-02-24 23:25:17 -05:00
AndrewJacksonThe2nd
e7b8e81ab6 Update chameleon.dm 2016-02-24 20:19:45 -08:00
AndrewJacksonThe2nd
dcbafb716b fixes 2016-02-24 19:33:37 -08:00
CosmicScientist
4c34677a6b debuffs feel good factor, buffs my sanity 2016-02-25 00:34:24 +00:00
CosmicScientist
81956d0083 fixes desc of riot armour 2016-02-24 23:41:10 +00:00
phil235
3ea7cf9831 The AI's core no longer fits inside regular closets (but still fits inside bluespace bodybag). 
Ghosts and camera mobs no longer get inserted inside closets.
Fixes an error in alien nest code.
 2016-02-24 22:56:54 +01:00
KorPhaeron
62ce96e20e Adjacency checks 2016-02-24 13:20:12 -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
KorPhaeron
66689856d3 Span classes 2016-02-24 01:09:53 -06:00
AndrewJacksonThe2nd
38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA 
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
 2016-02-23 21:06:36 -08:00
KazeEspada
f44a2ca210 Fixes Plasmamemes for realsies. Monkeys and Humans now breath all of their breath as long as they can process that gas. 2016-02-23 21:54:42 -07: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
KazeEspada
ff45d89eac Fixes Plasmameme and breathed gases no longer go to turfs. 2016-02-23 16:18:41 -07: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
AnturK
e22dddb50a Minor Improvements 2016-02-23 21:44:21 +01: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
de89460706 Envy 2016-02-23 06:31:40 -06:00
KorPhaeron
9d208197ba Sloth 2016-02-23 05:05:11 -06:00
Cheridan
2901f3d8f0 Merge pull request #15684 from KorPhaeron/snowdin 
Removes die of fate from snowdin
 2016-02-23 01:48:03 -06:00
KorPhaeron
d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06:00
AndrewJacksonThe2nd
6a75d96966 Update chameleon.dm 2016-02-22 21:56:49 -08: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
AnturK
4e0db5664b Adds /turf/template_noop and /area/template_noop to dmm reader 2016-02-22 19:24:45 +01:00