Commit Graph

6249 Commits

Author SHA1 Message Date
S34N
667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
FloFluoro
332fc9193a Fixes description grammar in a few places (#19607)
* Fixes punctuation on clown box description

* Fixes grammar in a couple places
2022-11-06 10:43:20 +00:00
FloFluoro
923e4b933a Adds new lawset, "Pranksimov" (#19306)
* Adds new lawset, "Goofsimov"

* Goofsimov module now spawns at player's feet

* Module renamed to AsiFun

* Renamed... again!
2022-11-05 13:44:41 +00:00
Coolrune206
e80ae1f95f Removes .357 Speed Loaders from Autolathe, replaces with .357 Ammo Boxes (#19553)
* revolvers are balanced now, right?

* decreases metal cost per bullet from 5000 to 4000

* converts bullets to a new ammo box

* shut up Marmite (makes the revolver unrecyclable)
2022-11-03 18:01:05 +00:00
Contrabang
32146754c1 bye bye macro (#19574) 2022-11-02 20:52:22 +00:00
Henri215
473a46ff5a Tweaks to autolathe design costs (#19469)
* first wave of tweaks

* Update code/modules/power/cable.dm

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>

* Edan52 review

* missed one

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
2022-10-28 20:05:46 +02:00
Henri215
0a3111f6cf Matter wont consume if theres a wall already (#19518) 2022-10-28 20:04:26 +02:00
Vi3trice
03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388)
* I wasn't done

* nits
2022-10-28 19:28:23 +02:00
GDN
9400729a28 Removes some technical debt (#19220) 2022-10-28 19:09:21 +02:00
Henri215
47b3d08f04 Newscasters/camera monitors/displays tweaks (#19305)
* frames and autolathe

* final adjustment

* engine monitor

* circuit board selection and newscaster tweaks

* names adjustments

* entertainment frame icon adjustment

* moving to another PR

* forgot to move those

* added the other monitors circuit boards

* Update code/game/machinery/computer/camera.dm

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

* removed unnecessary flow

* display

* entertainment frame uses correct icon now

* merge conflcit part 2, do_build for newscasters

* moving var

* Sirryan suggestion and reverting piece of code removed by mistake

* Update code/game/machinery/computer/buildandrepair.dm

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

* added description

* Apply suggestions from code review

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

* Sirryan suggestion and removed 1

* moved to on_deconstruction

* Removing unused arguments

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-10-28 19:00:03 +02:00
AzuleUtama
c8edc8c240 Syndi Bundle Rework (#19352)
* Syndi Bundle Rework

* Revised bundles based on feedback

* Reworked operative into grenadier

* Corrected payday value
2022-10-26 00:19:56 +01:00
Vi3trice
fc7e4847b3 Penlights are universally pens (#19498)
* You're a pen, you're a light

* Update code/__DEFINES/is_helpers.dm

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

* Might as well remove them

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-10-26 00:12:14 +01:00
Henri215
499a0f3b9d Moved wood floor (#19487) 2022-10-25 20:35:28 +02:00
Contrabang
a6ba421e21 removes implantchair.dm (#19460) 2022-10-23 16:39:45 -05:00
roarbark
71bd40099c buffs the radio jammer (#19377)
* buffs the radio jammer

come on and jam and welcome to the jam

* come on and jam

the jam

* i never actually watched space jam i just thi

running outta jokes

* unjams the pr

im so fucking funny bro

* unfucks the pr for real (developers swearing bot hello)

worth a try
2022-10-23 11:20:20 -05:00
BiancaWilkson
21fc24a31c Ports Yogstation's version of CQC, adds it back to traitor uplink. (#19310)
* Changes most instances of brute to stamina, combos

* Adds CQC back into uplink

* Updates chokeholds so it takes time to knock out

* Adds cqc back to tot uplink, gives nukies discount

* Tweaks base grabs and disarms

* Tweaks combos some

* I am a mild idiot

* Charlie's suggestions

* I don't like these numbers, nerf head kick

* Removes blocking and countering

* More kicking tweaks

* Update code/datums/uplink_item.dm

commit charlie's changes pt. 2

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* stop kicking yourself

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-10-22 21:42:17 +01:00
Farie82
8386e9cdef Fixes waterpacks and friends not GCing (#19269)
Move nozzles to Initialize
Makes reagents not hold a reference to their atom when they get destroyed
2022-10-18 22:52:35 -05:00
DevanStrife
bb2e2a9d45 Allows wooden airlocks to be made and removes another text2path function. (#19199)
* Fixes #18882 and refactors for door assemblies

* Removes text2path, makes wooden airlocks buildable

* Use mineral crafting menu

* Minor oversight

* Comments improvement

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

* Review suggestions

* Removes unneeded vars

* Fixed tab spacing

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-16 13:04:50 -05:00
Henri215
d9903511e8 Adds the chameleon counterfeiter (#19335)
* added cham counterfeit main code

* overlays and uplink

* icon

* small message fix

* adjustments

* updated cost

* Apply suggestions from code review

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

* remvoved duplicated and added suggestion

* description

* adjustment

* moved to new file

* moved to new file and farie suggestion

* added examine override

* removed unnecessary stuff

* Update code/game/objects/items/devices/chameleon_counter.dm

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

* removed unnecessary stuff

* Update code/datums/uplink_item.dm

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

* lewcc suggestions

* moved playsound to before if

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-10-16 16:43:50 +01:00
GDN
f4a55d844b Grenade GC improvement (#19355)
* Grenade GC improvement

* Adds commits

* farie's suggestion

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-16 16:22:27 +02:00
Henri215
70762ba7e0 Adds briefcase/card box as leather recipes and reorganizes other recipes (#19342)
* adds briefcase and card box to leather and reorganizes recipes

* standardized the coded and removed unnecessary  \

* seconds
2022-10-16 13:47:33 +02:00
GDN
e510680a20 adds blackbox logging for revival (#19399) 2022-10-16 12:33:41 +01:00
SteelSlayer
7be863bb77 fixes scuffed RCD airlock image previews (#19386) 2022-10-15 23:18:22 +01:00
S34N
edeba92326 Smoke spells readability (#19387)
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

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

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 18:05:55 +02:00
Henri215
7905238159 Fixes point of sale description (#19221)
* fix typo and pos into phone subtype

* description update

* Update code/game/objects/items/weapons/misc.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-10-14 22:36:14 -05:00
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
Contrabang
2410930b2b fixes radios (#19367) 2022-10-13 21:45:42 +02:00
GDN
313495d36e Puts paper on layer 3 (#19344) 2022-10-12 20:19:07 +02:00
Shadow-Quill
3958de2de4 Adds some examine helpers (#18997)
* Adds some examine helpers

* Includes suggestions

* Macroifies some "the"s

* Update code/game/machinery/camera/camera.dm

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

* Apply suggestions from code review

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

* Update code/game/objects/items/devices/radio/intercom.dm

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-10-11 08:11:23 +01:00
Contrabang
cb513cf52e [TM] [TGUI] Kitchen Improvements (#19165)
* this got a bit... out of hand

* update icon

* extra lines begone

* soundfix

* sirryan review pt1

* fuck I accidently deleted a line

* sirryan pt2

* AA suggestion

* more review

* hooooly crap

* lewcc review

* reviews

* table

* merge master

* Revert "merge master"

This reverts commit c3ec73a0f8.

* bundle css

* reviews and revival

* fuck I missed a file

* steel review
2022-10-11 00:06:03 -05:00
Vi3trice
57f5573fe8 Candles do not repeatedly update their icon on every process (#19233)
* Even the smallest of things do very unnecessary things

* Update candle.dm

* Update candle.dm

* Update candle.dm
2022-10-10 21:22:16 +02:00
Vi3trice
9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning

* Update stack.dm
2022-10-10 20:50:29 +02:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
Vi3trice
1e2ab44f69 Stop making pipes (#19271) 2022-10-08 12:02:41 +01:00
S34N
7b5a60ef93 New newscaster sprites (#19251) 2022-10-08 12:02:21 +01:00
Contrabang
cfd30f5c6a fix to fix to fix (#19301) 2022-10-07 13:52:44 +02:00
Henri215
e4bfa0e2f7 Fix #18872 Shark teeth is no longer invisible (#19229)
* picks teeth icon instead of shards (large/medium/small)

* Update code/modules/fish/fish_items.dm

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

* contrabang suggestions

* suggestion

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/shards.dm

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

* verb and state icons

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-07 13:49:43 +02:00
Henri215
a44a9c764a Linen bin/ashtrays/coin presser tweaks (#19207)
* tweaks for linen bin and ashtrays

* Apply suggestions from code review

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

* deleted empty line

* coin presser can now be unfastened

* Update code/modules/mining/mint.dm

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

* suggestion

* rewind time

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-10-06 09:58:27 -05: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
McRamon
888c78e160 New ability icons (part 1) (#19261)
* Removes unused sling icons

* first wave of icons

* more icons and stuff

* more icons and fixes

* mindswap fixed

* more actions.dmi adjustments

* some more

* dust biochip unique icon

* small fix

* test

* Update actions.dmi

* mhm

* reverse of some changes that are pointless as it stands

* Update implant_dust.dm

* bio-chip icons

* dust_implant new icon path

* missing icon for human form cling ability added

* removed the directional icons of the immrod action icon (yes)
2022-10-05 22:54:38 +01:00
Contrabang
94f85b8837 Makes RPDs not smash pipes when placing a new pipe (#19205)
* rpdrpdrpdrpd

* lewc revision

* whoopsies I accidently removed a param
2022-10-04 22:18:23 -05:00
Contrabang
e8cdadbd52 implant merge (#19282) 2022-10-04 16:35:50 +01:00
FloFluoro
6a876e1994 Standardize cleaning object behavior into "cleaning_act" proc (#19001)
* Standardizes cleaning item functionality into "cleaning_act" proc

* Culling commented-out code

* Damp rag now checks for humans before cleaning

* Change proc scoping, moved mop reagent check out of cleaning.dm

* Adds can_clean and post_clean procs to handle mopping, removes ismop parameter

* Adds can_clean() to cleaning objects/mobs

* cleaning_act() now carries message strings as params

* Refactored cleaning_act() for earlier returns and less redundancy

* cleaning_act now runs on the target atom, instead of the cleaning object

* Changed turf checks to overrides, rescoped clean_turf, lots of tidying

* Removed cleaner param from post_clean, since it'll always be src

* Code review tidying

* Tidying..........

* Removed clean_turf and put its functionality in turf/simulated/cleaning_act(), added new param to keep track of original targeted object

* Moved cleaning.dm from datums to code/game/objects

* Added early return, defined cleanspeed in seconds
2022-10-03 20:25:00 +01:00
Henri215
77258c2ffd flyswatter fix (#19180) 2022-10-01 17:59:25 +02:00
Henri215
5fc267c58d Adds in hand sprites for plastic fork, pspoon, pspork, pknife and spork (#19082)
* adds in hand sprites for pfork/pspoon/pspork

* added in hand sprite for plastic knife

* forgot to add left hand for spork,spoon and fork

* no idea how that sprite got removed

* fix spork icon and add right hand

* left hand for spork

* ??

* fixing conflict mistakes

* test

* ..

* left hand fix

* fix of the fix
2022-10-01 00:18:09 -05:00
S34N
d984808100 sirryan did this to me (#19176) 2022-09-29 20:43:10 +01:00
Qwertytoforty
b3cd14d3ad Reworks nanocalcium injectors to be better. (#19122)
* Reworks nanocalcium injectors to be not shit

* better

* no s

* better math

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

* removes dead, updates percent

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-09-25 17:48:12 +01:00
Henri215
9cb85bc2f3 mutation_chance no longer divided by 2 (#19100) 2022-09-25 17:38:21 +01:00
S34N
924e8cc949 Renames non-cybernetic implants to bio-chips (#18937)
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

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

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-09-24 14:24:25 +01:00
Henri215
8fb01a0079 Fix #18731 Mixing bowl now disposes properly (#19144)
* mixing bowl now disposes properly

* Update code/game/objects/items/mixing_bowl.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-24 12:57:45 +01:00