cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-06 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,940 Commits 60 Branches 14 Tags
2bb568bf2beddeee5f1f28cbc1e15bdcfb2e2cb0
Commit Graph

121 Commits

Author SHA1 Message Date
Remie Richards
1caec83f5d Crafting TGUI improvements (#19170) 
* Reduced number of istype() calls per ui_data() by ((2*requirements_num) + catalysts_num + tools_num)*recipes_in_category_num
* Added a "Compact" mode for crafting
 2016-07-08 13:27:37 -04:00
Iamgoofball
41a5c65434 Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985) 
READ THE TITLE
 2016-05-29 08:29:21 -05:00
Cheridan
e6c89f3b3a Merge pull request #17977 from lzimann/revert-17901-bawhoppen_copyen 
Revert "Removes some obselete attackby() code [Removes attackby crafting]"
 2016-05-28 00:37:19 -05:00
Leo
7304f31325 Revert "Removes some obselete attackby() code [Removes attackby crafting]" 2016-05-27 20:37:45 -03:00
Remie Richards
80b4c3ca7f Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui 
Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js
 2016-05-28 00:24:58 +01:00
Remie Richards
8bcb4789bd Fixes a character that caused issues for tgui. 2016-05-24 18:45:37 +01:00
Remie Richards
26dad0b768 Converts personal crafting to a TGUI interface. 2016-05-23 20:59:27 +01:00
Lularian
e7fa4e66ee fixed 2016-05-23 04:07:51 -05:00
Lularian
1a136935f5 I didnt want to have to rewrite the whole specific format okay 2016-05-23 03:49:50 -05:00
Lularian
e94cc7c717 fine 2016-05-23 03:47:29 -05:00
Cheridan
7146bbc11c Merge pull request #17762 from Bawhoppen/somefixesIguess 
Removes old shotgun handcrafting
 2016-05-19 04:31:25 -05:00
Lularian
db01440302 ishotgun 2016-05-18 04:12:16 -05:00
KorPhaeron
81300765ee Respect the freeze 2016-05-18 00:37:03 -05:00
KorPhaeron
ef9c9cd625 Fix for sinew belt recipe 2016-05-18 00:36:37 -05:00
KorPhaeron
0cf94ad6b0 Explorer Gear 2016-05-18 00:31:48 -05:00
TehZombehz
076fc0df79 Adds Bone Weaponry (#17672) 
* Adds Bone Weaponry

Adds Bone Spears, Axes, and Daggers, all craftable.

* '''Balance'''

I listen to the suggestions of others.

* Fixes
 2016-05-14 18:31:36 -05:00
Mercenaryblue
72ff107481 Clown Update - Golden Bike Horn (#17530) 
* Golden Bike Horn 1.0.0

Adds the golden bike horn to the game.

* Golden Bike Horn 1.0.1

Adds a deaf check

* Golden Bike Horn 1.0.2

Removed the extra bike horn sound when hitting yourself.

* Golden Bike Horn 1.0.3

flip_mobs() proc optimize the code.

* Golden Bike Horn 1.0.4

Fixes

* Golden Bike Horn 1.0.4.b

mob/user

* Golden Bike Horn 1.0.4.c

Last change

* Golden Bike Horn 1.0.4.d

No longer responsible for the lack of returns
Honk

* Golden Bike Horn 1.0.4.f

Fudge
 2016-05-14 16:11:45 -05:00
Razharas
d0d93d1d81 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoloshitHalfFix 
Conflicts:
	code/modules/crafting/table.dm

Merge conflicts fix
 2016-05-11 23:46:51 +03:00
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
Razharas
9b051d7cf5 Adds flag to mark items as holograms 
Adds flag to mark items as holograms
Will fix the tablecrafting with holoshit and unreported autolathe abuse
 2016-04-26 15:19:39 +03: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