cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 07:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,967 Commits 61 Branches 14 Tags
bfbb76df0bf89fbdebb204e40dd83c585bbb64f4
Commit Graph

102 Commits

Author SHA1 Message Date
Razharas
0a3ddc886c Turns tablecrafting into personal crafting (#17341) 
* Converts tablecrafting to datums

* Adds crafting.dm

Adds crafting.dm

* Fix merge conflicts

Fix merge conflicts

* Fixes dme

* Fixes returns

Fixes returns

* Only check hands and remove old paths

Only check hands and remove old paths

* Recipe fixes

Recipe fixes

* Removed action button

Removed action button
Added small ui button to inventory near the intent wheel
Removed debug
href_list is not longer /list

* Added adjucent checks

Added adjucent checks

* Snacks now get chems from parts

Snacks now get chems from parts

* Complex food fuckery fixed

Complex food fuckery fixed

* Fixes old recipe

Fixes old recipe

* Fix to infinite loops in reagent extraction

Fix to infinite loops in reagent extraction
It was finding old empty containers and tries to extract from them

* Fixes hands not checking

Fixes hands not checking

* Fixes reagents fucking up

Fixes reagents fucking up

* Even more reagent fuck ups fixed and comments

Even more reagent fuck ups fixed and comments

* Fixes all the shit i could find

Fixes all the shit i could find

* Removes debug and mechs

Removes debug and mechs

* Argument renaming

Argument renaming

* Fixes all argument names

Fixes all argument names

* Final fix of arguments

Final fix of arguments
 2016-05-09 18:14:48 +02:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment 
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
 2016-05-05 21:57:10 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
TechnoAlchemist
528ce49e57 Adds dragon hide cloaks (#17322) 
* dragon scales and cloak stuff

* Finishes shit with the ash drakes and the cloak

* woopsie
 2016-05-04 00:43:31 -05:00
Razharas
d8232cbf33 Revert "Adds player preference to hide irrelevant tablecraft recipes" 2016-04-29 17:47:31 +03:00
Razharas
7b49961371 Merge pull request #16978 from nullbear/tablecraft-tweak 
Adds player preference to hide irrelevant tablecraft recipes
 2016-04-29 15:26:14 +03:00
nullbear
5cd0cca621 Adds more reuseable c4 type path. Adds x4. Fixes chembomb recipe. 2016-04-29 03:31:17 -07:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz 
Some sandbag changes
 2016-04-27 20:23:21 -04:00
TechnoAlchemist
0a8da62457 adds primal category to stop clutter in cat_misc. 2016-04-26 16:34:54 -07:00
TechnoAlchemist
5b19023f24 adds skull helmet. 2016-04-26 13:35:00 -07:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
TechnoAlchemist
c5506d19af Adds craftable bracers, adds watchers dropping bones. 2016-04-22 19:06:41 -07:00
KorPhaeron
0099ea2d93 Merge pull request #17036 from TechnoAlchemisto/goliathbones 
Adds Bones and sinew to butchering results. Adds bone armor(craftable)
 2016-04-22 18:08:51 -05:00
nullbear
a7c9c80977 tiny fixes to little things 
allows deconstruction of xenobio computer again.

renames chem grenades to chem grenades.

makes advanced grenades scale up their unit thing.

makes chemical payload scale up with matter bin used in construction,
and more accessible in general
 2016-04-22 03:20:47 -07:00
TechnoAlchemist
72c74194df Adds Bone Necklace talisman. 2016-04-21 16:50:21 -07:00
TechnoAlchemist
7b79508b17 bone ore and path REFACTOR. 2016-04-21 15:36:27 -07:00
TechnoAlchemist
e61fba82ea Adds Bones and sinew to butchering results. Adds bone armor. 2016-04-21 12:58:15 -07:00
nullbear
421724d383 Brings back early return. 
Since min_req isnt needed anymore, no reason to continue the loop if it
has at least one component.
 2016-04-19 11:51:21 -07:00
nullbear
b8a5871f84 Gets rid of the config portion of this UI 2016-04-19 09:10:25 -07:00
Cheridan
d671bf573c Merge pull request #16858 from nullbear/Chemical-Explosives 
Adds Chemical Explosives
 2016-04-18 02:35:56 -05:00
nullbear
df32979866 Adds Chemical Explosives 
see changelog for details
 2016-04-13 13:09:41 -07:00
phil235
d03a5c9343 Simplifies the build_recipe_text() proc used by tablecrafting to not create and delete an object just to get its name (replaced by the "initial()" trick). 
Adds some if(seed) checks to growns code to prevent runtimes for seedless growns.
 2016-04-12 03:51:45 +02:00
bawhoppen
5c513649dd changes welding tool requirement 2016-04-08 21:12:18 -05:00
Lularian
04fa742e0c pin removal 2016-04-07 09:07:02 -05:00
bawhoppen
af51a66e37 Adds sandbags 
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
 2016-04-02 23:52:12 -04:00
TehZombehz
37a3c4373b Adds craftable paper sacks 
Adds craftable paper sacks
 2016-03-27 23:37:43 -05:00
Razharas
b81c54b335 Merge pull request #16078 from PKPenguin321/scoot-scoot-thats-the-sound-of-the-police 
Adds scooters and skateboards
 2016-03-15 05:11:47 +03:00
PKPenguin321
69372b03ab adds tablecrafting recipes 
also makes skateboards nondense because their sprite was so small and it's awkward bumping into something that small
 2016-03-13 21:58:04 -07:00
duncathan salt
fa62cefaac Merge pull request #15958 from Impisi/ImprovisedShellChanges 
Improvised Shell Rework Attempt 2
 2016-03-12 15:16:08 -06:00
AnturK
8701541d20 Fixes not being able to unbuckle from surgery tables 2016-03-12 21:44:45 +01:00
Impisi
6670b9993a unfucks everything. Well, at least I think so. Oh and the overloaded shot now fires four pellets instead of six. Feels a little limp dicked for the cost and prep but I'm getting paranoid over its power potential. Lets see how people use this before making balance changes. 2016-03-07 04:40:54 -08:00
PKPenguin321
d9a214e931 adds bolas 
adds the item itself and a hand-crafting method to handcuffs.dm
adds a tablecrafting recipe to recipes.dm
adds the sprite to items.dmi
 2016-02-26 17:59:55 -08: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
tkdrg
41901027db Merge pull request #15362 from lzimann/table 
Some table fixing
 2016-02-10 19:18:32 -03:00
Leo
57aa7a8521 Ghost Mekhi no longer in the table 2016-02-10 03:43:07 -02:00
Leo
c0eda39018 Changes the 'usr' to 'user' 
That's why you read before commit
 2016-02-09 19:53:14 -02:00
Lzimann
831d2e04cc Fix tabecrafting menu opening when you click the table 
Also adds a cursor change when you drag the table to you. And fixes tablecrafting menu not opening if the table is empty.
 2016-02-09 19:46:39 -02:00
PKPenguin321
af0a05d55a halves most tablecrafting times 
pretty much anything that was already below 20 was left alone
 2016-02-06 17:55:07 -08:00
Razharas
ee607f5367 Some assembly requaired 
Changes wirecutters for an igniter in a stunprod
Stunprod sparkles on proding
Timer now have repeating setting, will restart again and again after
expiring
Voice analyzer got exclusive mode that works like a password, i.,e. need
a perfect match of the phrase
Voice analyzer got voice recognition mode that remembers human voice
instead of speech, works like personality recognition
Voice analyzer got a sensor mode, works on any speech it hears from
anyone
Voice analyzer modes and changed by applying a multitool to it
 2016-01-26 02:43:08 +03:00
KorPhaeron
4bdf1a882b Lizard hats 2015-12-29 13:01:13 -06:00
bgobandit
7d7468efe6 fixes honkworthy oversight 2015-12-12 15:38:40 -05:00
bgobandit
112dc6c6f6 adds feature inheritance, fixes recipe 2015-12-12 02:40:23 -05:00
bgobandit
5fa93e0e55 Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats. 2015-12-11 19:03:09 -05:00
PKPenguin321
8e09b00f2c Merged upstream 2015-11-28 15:49:41 -08:00
PKPenguin321
cf29721672 fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached 2015-11-26 18:28:12 -08:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
PKPenguin321
10f9e4af4f adds teleprods, a way to make them with bluespace crystals and a stunprod, and a tablecrafting recipe 2015-11-25 18:36:09 -08:00
Firecage
26bbd93522 Makes it so only advanced tool users can use tablecrafting. 2015-10-27 02:01:47 +02:00
Remie Richards
2e7cb827f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into CameraObscura 
Conflicts:
	code/modules/crafting/recipes.dm
 2015-10-26 00:04:36 +00:00
Remie Richards
d524b4acde Adds a special camera that can see ghosts (if the ghost is orbiting something they are skipped, this is to prevent it being used for power/meta gaming) the Chaplain spawns with one and they can be tablecrafted using a camera and holywater 2015-10-24 00:53:36 +01:00