Commit Graph

139 Commits

Author SHA1 Message Date
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
LiberatedWaveMan
e09be2b54e You got a fuckin' problem mate? Adds the glass shiv (attempt 2) (#22416)
* Redoes the Shiv PR, adds shiv (ready to go)

* Update code/modules/crafting/recipes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/crafting/recipes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update kitchen.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-19 22:47:53 +01:00
Qwertytoforty
d42d2f647d Added the Combat Bakery Kit (#21901)
* QUASO

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* blame lewc for giving me spaces

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/datums/components/boomerang.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/granters/_granters.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* purge that

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-13 21:32:30 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
DGamerL
887a5111df Adds confetti shot (#21462)
* CONFETTI CANNON

* proc and contra review

* sprite names

* nukie uplink and lewcc suggestions

* chemical fixed

* fixes party drums cost and chem explosion sound

* Henri review

* renames a datum because I copypasted shit

* changes a name because I copy pasted

* removes an extra space

* things I forgot + bundles + recipe change

* Oopsie + tones down the volume of confetti
2023-07-07 13:44:55 +01:00
Qwertytoforty
eb3b6758a9 Universal self assembling gun part kit (#21292)
* Universal self assembling gun part kit

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* universally avalible

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-06-21 22:45:52 +01:00
DGamerL
d9f5e1fa49 the logging (#21310) 2023-06-12 17:21:25 -05:00
Taran
7b2bd705b2 Fixes molotov cocktails being used to craft molotov cocktails (#20989)
* blacklists molotov cocktail for crafting itself

* prevents using a blacklisted items to craft

* for loops ands comments

* Update code/modules/crafting/craft.dm

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

* Update code/modules/crafting/craft.dm

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

* adds missing ")"

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-22 21:31:27 +02:00
Qwertytoforty
d5567103fd Reworks the lwap to make it better. (#20884)
* Boss you killed a child... AMAZING MISSION COMPL-

* small patch fix other stuff later

* More fixes to clicking on the dot

* lwap scopes better / decativates on movement

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* requested changes

* lower speed by marms suggestion

* scope keeps creeping

* Apply suggestions from code review

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

* henks changes

* define

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-02 21:28:34 +02:00
S34N
3efa23076c Fixes wonky donk list (#20707) 2023-03-26 11:45:23 +01:00
Burzah
de357e657d adds a category to empty donk box (#20694) 2023-03-22 10:04:29 -05:00
Coolrune206
48eb386e5c Donk Pocket Cooling 2: The Reworkening (#20453)
* donk pocket rework

* Snowball had a far more sensible way to do this

* lewcc review

* Sirryan review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* I fix?

* Revert "I fix?"

This reverts commit 1517d2e21e.

* please work you stupid .dmi

* WORK DAMN YOU

* will this hypothetically work

* re-adds syndie donk kit

* documented these

* just return

* clause guarded

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-20 14:26:06 -05:00
Qwertytoforty
5197d1b62a Completely reworks the tesla revolver (need to work on damage values) (#20295)
* part one: the rest of a fucking owl

* kit

* shocking changes

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/projectiles/projectile/energy.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/projectiles/projectile/energy.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update energy_projectiles.dm

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-17 10:26:02 -05:00
Coolrune206
0aeee5abea where's my cookie matt (#20537) 2023-03-04 22:20:00 +00:00
Coolrune206
f90418d715 Re-adds the LWAP, reworked (#20401)
* re-adds the lwap

* no dual wielding snipers

* Lewcc review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Hal9000 request

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 21:19:03 -06:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
2022-12-29 14:28:40 +00:00
warriorstar-orion
a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Coolrune206
447edfdf83 converts laser slugs to laser scatter shot (#19552) 2022-11-01 20:51:08 +01:00
Qwertytoforty
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
Vi3trice
20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
Contrabang
8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
Qwertytoforty
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
Bm0n
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
Kugamo
7e822f71f8 Fixes Golden Bike Horn Crafting Runtime (#17948)
* ClownCraft 2.0

* oops
2022-06-11 20:55:19 +01:00
moxian
4637ccb2f2 Fix crafting not consuming items (#17856) 2022-05-24 16:02:00 +01:00
Vallat
7788cb0cda Personal crafting code refactor (#17738)
Co-authored-by: moxian <moxian@users.noreply.github.com>
2022-05-23 23:09:55 +09:00
Fox McCloud
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-MonaRhg
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
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07: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
SteelSlayer
e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
Ryal
93a0f58f21 Honkbot tweaks (#15808) 2021-04-05 15:56:57 +01:00
SabreML
76e237edc5 Fixes HUD sunglasses deconstruction (#15444)
* sunglasses

* Unit test test

* Unit test test tested
2021-03-14 13:17:20 +00:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
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
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud
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
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
Darkmight9
bfad9ee952 Makes meteor shot uncraftable (#14938) 2020-12-16 14:08:31 -05:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07
984ac231e0 Nano Is Dead 2020-11-21 09:46:50 +00:00
AffectedArc07
86b5f8395e [TGUI] Crafting (#14700)
* TGUI Crafting

* Mochi Tweaks
2020-10-23 14:13:07 -04:00
Kugamo
54bd26b470 Adds Salmon Suit (#14419)
* Adds the Salmon SUIT

* fixed missing pixel
2020-09-25 16:10:22 -04:00
Kugamo
27edf99e06 Adds rubber ducky shoes (#13996)
* adds rubberduckyshoes item

* Adds crafting recipe for rubber ducky shoes

2 rubber duckies, 1 sandal using Wirecutters

* Adds icon for rubberducky shoes

* Adds character sprites for rubberducky shoes

* Adds in hand sprites for rubberducky shoes

* removes pointless variable, and I redid the description.

* Adds rubber ducky to the merch console

done since theres normally only 3 ducks on station, giving some more access to duckies I think is warrented. This might be to much.

* Adds species specific sprites for Vox and Drask

* removes pointless list

* moves crafting recipe to clothing category

* Removes entry in merch console, adds entry in prize vendor

* Revert "moves crafting recipe to clothing category"

This reverts commit b80c398b46b3e60a10b78461d753b6ef6e3ac88b.

* Revert "Removes entry in merch console, adds entry in prize vendor"

This reverts commit c4ae6c3767d2d5ad072ae5befcb1f66b99cb6c63.

* Adds entry into arcade prize vendor

* Removes entry in merch console

* adds crafting recipe to clothing category

* removes recipe from misc category

* corrected messed up sound file location

* Updates icons/mob/feet.dmi

* Updates icons\obj\clothing\shoes.dmi

* improved the item icon

* deconflict
2020-09-16 18:29:49 -04:00
mochi
7866535ce3 Use key_name_admin() when alerting admins on craft 2020-09-04 22:16:37 +02:00
SteelSlayer
74d0e6523b Fixes welders blinding you when you repair robo-limbs and cyborgs (#12988)
* Fixes welders blinding you while repairing your own robo-limbs

* gives tool_start_check() a target argument

* flash be gone

* CRLF to LF

* adds trailing newlines because travis wants them I guess

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-06-26 01:18:13 -06:00
AffectedArc07
64dc83846e Main part works. but we still got a long way to go 2020-05-14 22:46:26 +01:00