Commit Graph

4071 Commits

Author SHA1 Message Date
GDN
1a5ce03ec3 fixes the mopbucket not taking mops (#20013) 2023-01-06 21:57:19 +01:00
warriorstar-orion
e31867774d Unequip gib victims earlier in the process. (#19846)
* Unequip gib victims earlier in the process.

* formatting fix

* Bring nukie bomb implants back in line with current behavior.

* Logic, style, and doc cleanups.

* farie review 1

* whoops
2023-01-06 21:33:36 +01:00
Qwertytoforty
7fb017915f Makes cling tentacle more reliable / less shit (#19855)
* Cling tentacle love, part 1/2

* legcuff sprite

* S34N's changes

* Apply suggestions from code review

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

* attack logs.

* BOY I LOVE ICON CONFLICTS 1/3

* BOY I LOVE ICON CONFLICTS (3/3)

* EYE FOR AN ICON

* description update

* Final changes, whoops

* [H]

* swap the order

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-06 21:31:37 +01:00
AffectedArc07
1feb9fbd38 [READY] Atmos Refactor Part 7 (I think) - Kills signals + TGUIs stuff (#19867)
* I AM NOT A KING. I AM NOT A GOD. I AM LUNACY.

* THE SCOPE CREEP

* This was done in vi. No langserver. Send help.

* Progress

* Some issues fixed

* The code builds, but the maps dont

* CC builds, I doubt anything else does

* Do this now

* Safety

* The map compiles

* THE MAPPING HELL

* Airlock controllers dont work

* Fixed bombs

* AND THATS FIXED

* Phantom edit

* Restores LL I think

* The mapmerge hooks are actually retarded

* Fixes spawners

* Half working air control

* Picky

* Hyper efficient tank monitor

* Sanity

* Laying the framework

* Improved alert console

* Dont think this is actually done anywhere

* Metering

* ONE HUNDRED AND ~~EIGHTY~~ TWENTY SEVEN

* WE ARE READY FOR BOX TO BUILD

* One map done

* Well that was easy

* Another one

* I think this is done

* I should have removed this

* I would make a russian joke but <current event>

* Delta WIP

* Makes delta work

* Early review

* TM safeguard

* oops

* METAAAAAAAAAAAAAAAAAAAAAAAAA

* Fix #4213

* Trailing

* oh for piss sake

* Shutter fix

* Roundstart ATs can go away

* Review pass 1

* What could go wrong

* BOOM BOOM BOOM

* Not needed

* Fix seed vault

* Oops

* Review changes
2023-01-03 20:59:35 +00:00
Bm0n
ab2312b234 Tool resprite (#19873)
* modernization is nonnegotiable

* cable

* 3000 slanty face emojis of bmon

* i conflicted with one of my other PRs. bruh

* life is a merge conflict

* as above

* update_overlays()

* jaw jaw jaw jaw

* always test your icons

* tweak to onbelt

* belt again

* deconflict

* jawbeltupdateagaingodammit

* spriterror

* seconds
2023-01-01 12:16:49 +00:00
GDN
415b0aa826 observers see ALL (#20021) 2022-12-29 23:32:57 -05:00
Charlie
8ef4aa727e Adds Shadow demons (#19732)
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

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

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-29 11:26:37 -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
066bd06e8d Whitespace cleanup part 3. (#19897)
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
2022-12-27 11:00:39 -05:00
Bm0n
4bb0eb822d Ports TG ID cards (#19807)
* new ids!

* tcomms fix for ERT

* as above

* star for ERT commander

* Syndie commander ID gets a star instead of crown

* fixed TDred ID card

* cmag tweak

* pda id overlay

* whoops i fucked up shaftminer

* first pass

* jobs_centcom

* SHHHHH

* WHY DO YOU HAVE GLOVES?
2022-12-24 18:15:49 +01:00
S34N
758a15010d duffels (#19984) 2022-12-22 19:55:28 +00:00
S34N
d55f6d10da Fixes a niche dufflebag issue (#19883)
* fixes chat issues

* removal fixes

* this
2022-12-19 14:32:49 +00:00
Qwertytoforty
a3b4475c67 Prevents BOH storing backpacks / belts of holding, increased rnd level req (#19819) 2022-12-07 21:06:39 -05:00
SteelSlayer
1343a6358b mindslave implant runtime fix (#19792) 2022-12-07 21:05:00 -05:00
S34N
6d38a64ec7 Dufflebag rebalancing (#19744)
* Adds duffel delay

* whitespace

* zip solution

* open bag on unzip

* zipping heck

* AltShiftClick
2022-12-06 19:52:34 -06:00
Bm0n
c5b2b9c221 Ports TG cigarette boxes and fixes matchbox (#19810)
* matchbox

* as above
2022-12-06 00:29:06 -06:00
Contrabang
72ee2f2488 fixes null belt icons (#19748) 2022-11-25 22:51:05 -06:00
FloFluoro
e1d608f45b Drask can no longer eat soap for infinite nutrition (#19664)
* Drask can no longer eat soap for infinite nutrition

* Added max_bites var

* Fix redundant return, syntax

* Splits soapeating behavior into own proc, design team requests

* overeat_limit is now a define

* Reduced weaken time, feedback

* Removed overeat penalty
2022-11-24 23:17:58 +01:00
Henri215
9003a869f1 Restock unit tweaks (#19704)
* Can use vending refill without having to unscrew

* weight size normal

* removing old comment that doent apply anymore

* Update code/game/machinery/vending.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-21 22:28:45 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209)
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

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

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

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

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-11-21 23:30:50 +00:00
Henri215
a7864e6e9a Clown FIX: Adds the clown recorder (#19710)
* Adds the clown recorder

* added item action

* Defining cooldown

* cmag define

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

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

* added a second laugh

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-20 23:13:52 +01:00
McRamon
765d966592 Secbelt and detective (#19666)
* scanner added

* fixed comma
2022-11-18 17:45:18 +00:00
Christasmurf
9a1b71493a garment bags (#19654) 2022-11-15 17:47:28 -06:00
Coolrune206
67add93f82 fixes cable cuffs changing secbelt color (#19656) 2022-11-14 22:56:56 +01:00
BiancaWilkson
46f43c5fe7 True! (#19660) 2022-11-12 09:01:37 +01:00
Charlie
421777b317 Reworks block chance into Parrying. (#19334)
* parry component

* converts block chance to parry components

* armour pen, katana fix, pickup fix

* melee parry fix

* removes perfect parries, tweaks armour pen calc

* SIGNAL_HANDLER

* fix

* resist fix

* reduces parry time out time, increases cooldown

* Apply suggestions from code review

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

* fix

* cooldown rebalance

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-11-12 08:49:44 +01:00
BiancaWilkson
aa7fd4eaf8 BEGONE (#19560) 2022-11-11 14:13:56 +01:00
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
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
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
Contrabang
a6ba421e21 removes implantchair.dm (#19460) 2022-10-23 16:39:45 -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
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
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
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
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