Commit Graph
83 Commits
Author SHA1 Message Date
warriorstar-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Coolrune206andGitHub 447edfdf83 converts laser slugs to laser scatter shot (#19552) 2022-11-01 20:51:08 +01:00
4c13246d30 Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 (#19170)
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5

* grammer / typeblock

* 15 is not more than 15

* how did I miss this, I swear I put in 3

* path + crafting

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-14 08:28:07 +02:00
QwertytofortyandGitHub d530aeba33 Energy crossbow gunkits now need a laser gun (#19087)
* Lockboxes energy crossbow gunkits

* converts to requiring a laser gun
2022-09-18 22:02:09 +01:00
Bm0nandGitHub d43eb77b25 Replaces Free Guns From Sci With Parts Kits (#17918)
* rip sci powergamers

* grammar

* apparently i don't know how to spell

* code review

* +to

* oook

* a over the
2022-06-26 18:53:03 +01:00
KugamoandGitHub 7e822f71f8 Fixes Golden Bike Horn Crafting Runtime (#17948)
* ClownCraft 2.0

* oops
2022-06-11 20:55:19 +01:00
Fox McCloudandGitHub 06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
E-MonaRhg ac68ea59df Carpet and table stuff 2021-11-05 19:46:42 +02:00
E-MonaRhgandGitHub f9c672ffa2 A lesson in testing your PRs (#16969) 2021-10-18 16:15:54 +01:00
E-MonaRhg 310616cdf3 Carpet bomb your local station 2021-10-14 20:23:11 +02:00
botka4aet ebf20f8806 Bone items review fix 2021-09-17 11:13:32 +03:00
botka4aet d49cfd2322 2 new tribal items 2021-09-10 11:07:54 +03:00
RyalandGitHub 93a0f58f21 Honkbot tweaks (#15808) 2021-04-05 15:56:57 +01:00
SabreMLandGitHub 76e237edc5 Fixes HUD sunglasses deconstruction (#15444)
* sunglasses

* Unit test test

* Unit test test tested
2021-03-14 13:17:20 +00:00
Fox McCloudandGitHub 75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519)
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
2021-03-03 20:21:30 +00:00
Fox McCloudandGitHub 003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Darkmight9andGitHub bfad9ee952 Makes meteor shot uncraftable (#14938) 2020-12-16 14:08:31 -05:00
AffectedArc07 64dc83846e Main part works. but we still got a long way to go 2020-05-14 22:46:26 +01:00
AffectedArc07andGitHub ded391b325 Bonfire Logs (#13268)
* Bonfire Logs

* Farie Suggestion

* Adds craft logging

* Log changes
2020-04-11 15:47:45 -06:00
AquilarandGitHub faa221c36b Makes personal crafting for all recipes work again. (#13032)
* allows personal crafting check tools to use paths again while preserving tool behaviours
converted all recipes from tools to tool behaviours.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>

* changes it to be a lot cleaner.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>

* more changes, like new proc and making so lists are separated properly

* efficiency things

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-03-01 14:57:06 -07:00
CitinitedandGitHub fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
2020-02-15 13:31:08 -07:00
Darkmight9andvariableundefined 19a29319de Decorations galore part 1! (#12615) 2019-10-27 00:30:05 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
AzuleUtama 61a899b5d1 Fixes improvised shotgun showing up as an ammo recipe 2019-09-25 18:18:50 +01:00
Fox McCloud 177ac43f23 next-we-melt-the-memories-that-are 2019-09-09 16:20:04 -04:00
Fox McCloud 91fffcc076 Updates/Refactors Personal Crafting 2019-09-03 17:58:33 -04:00
Fox McCloud 3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Mark van Alphen 37f5947d27 Sinew instead of leather 2019-06-07 04:12:01 +02:00
Mark van Alphen e0a21759fb Add tribal splints 2019-06-07 04:06:12 +02:00
Mark van Alphen ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
2019-04-30 19:26:17 +02:00
Arkatos1 3c4bccff18 Adds Floorbot color variants, minor refactors 2019-04-17 19:56:29 +02:00
f75de97c6e Port over Corn and affected's work on Lavaland
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
2019-04-01 23:41:32 +02:00
variableundefinedandGitHub 4521747046 Merge pull request #10750 from Nicaragua1/General_Griefsky
General Griefsky
2019-02-16 18:41:35 +08:00
Nicaragua 7cc13f6206 E-dagger version removed, now it's inheriting from secbots. Balance changes
This saved 200lines of code.
2019-02-10 18:56:36 -03:00
Nicaragua 2457fca12a added toy version removed crafting recipe for griefsky aprenttice 2019-01-27 05:16:44 -03:00
Nicaragua c4e3438833 oops forgot the ) and , . 2019-01-27 02:31:19 -03:00
Nicaragua 15f7f2a125 added crafting recipe for both jgriefsky and griefsky 2019-01-27 02:27:08 -03:00
Fox McCloud ad6fc45f74 Fixes Null Crafting Recipes 2019-01-22 18:45:54 -05:00
Nicaragua 8175d67b2e honk_bot from V2
Originaly from PULL

https://github.com/ParadiseSS13/Paradise/pull/10656
2019-01-21 12:31:47 -03:00
Citinited 48f37473d7 proper path for built snowmen 2018-12-30 02:25:34 +00:00
Citinited abe99ba8ad Snowman construction time tweak 2018-12-30 02:15:57 +00:00
Citinited ccb61518ae You can now build snowmen at Christmastime; removes commented out code 2018-12-30 02:15:05 +00:00
Improvedname cdc5ae5017 push 2018-12-25 19:50:44 +01:00
Mitchell 0855bd3f82 Lowers craft cost of mat. 2018-12-12 00:32:35 -06:00
Mitchell 54c4325c46 Adds Sushi Mat and Sushi Makiroll
Makes sushi 100% more efficient and viable to make a restaurant out of.
2018-12-07 13:28:10 -06:00
warior4356 9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
datlo 383a331f46 Adds the toxins payload casing to crafting
Adds a new type of bomb payload : The toxins payload. Crafted with a
matter bin, metal, and a remote signaller, it must be loaded with a tank
transfer valve and put into a plasteel bomb casing in order to do
anything. Once the bomb detonates, the toxins payload will open the TTV
(causing an explosion if the mix is correct).

As with syndicate bombs, a bomb with a toxin payload has a minimum 90
second timer, and will beep loudly to warn nearby crew to evacuate the
area.
It can be defused (or accidentally detonated early) in the same way a
syndicate bomb can.

This allows scientists a secure way to test their bombs (less chances of
accidental detonations with this method, although it adds extra steps),
and antagonists a way to craft their own syndicate bomb, which is better
than a simple tank transfer valve if your objective is not killing crew
but making sure a specific area is wiped off the station map with little
to no casualties.
2018-11-06 20:01:19 +00:00
warior4356 5f74e61731 Map changes, bug fixes 2018-10-29 03:21:52 -07:00
warior4356 13d927c10e Drills implimented 2018-10-29 01:10:10 -07:00
Fox McCloud 319a6cd500 Removes Explosive Lances 2018-07-03 18:13:51 -04:00