Commit Graph

11 Commits

Author SHA1 Message Date
PollardTheDragon
37bcc87b39 Expanded productivity bit usage (#30476) 2025-10-01 14:49:32 +00:00
Osetrokarasek
b9581ce380 Adds New "Carcinoma Angel" Cigs (#30338)
* vkfdnvhy

- Added "Densed Nicotine" reagent, which is similiar to Nicotine, but has lower overdose threshold, is not addictive and also deals minor lung damage, makes people cough, sends evil messages to user
- Added "Carcinoma Angel" cigs which contains "Densed Nicotine". They can be found in hacked or syndie/beach cigarette vendors or in maints as loot.

* Update drugs.dm

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* cough... new()...

* Update cigs.dm

* Update fancy.dm

* Update drugs.dm

* Update cigarettes.dmi

* Update cigarettes.dmi

* Update cigarettes.dmi

* Revert "Update cigarettes.dmi"

This reverts commit 831790523e.

* Update cigarettes.dmi

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-09-19 14:24:59 +00:00
Osetrokarasek
5e29e1ff0c Resprites Medkits (#30194)
* vloebjud

* vmjencjsv

- added inhand sprites

* ldfsovjnah

- Fixed icon for tactical kit

* bmjuamkvbf

- Fixed icons for ancient kit

* Update firstaid.dm

* fjdyvygt

- Review thingy

* Update firstaid.dm

* adsdada
2025-09-18 06:09:10 +00:00
Ahzpy
bd911799b8 Librarian Drip Expansion (#30167)
* all the sprites in the wrong place

* suits are now in the suit files

* code and whatnot

* oops all config

* hand holes, locker, garment bag, loadout

* adds locker to every station

* some fixes

* pleases review overlords

* fixes errors?
2025-09-16 18:59:32 +00:00
CRUNCH
763bd32861 The Smoking Expansion DLC II - The Second Puff (#30334)
* King's Own Tobacco

* Update cigs.dm

* cigar boxes

* badass

* CI

* CI (again)

* Update centcomm.dmm
2025-09-15 12:39:13 +00:00
kyunkyunkyun
8821ab9a66 Updates a couple of /obj/item variables (#29829)
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
2025-09-14 15:23:56 +00:00
Osetrokarasek
641d05863c ddd (#30339) 2025-09-11 03:17:48 +00:00
Contrabang
5b0447edcc Makes automenders rarer. Adds sutures/regenerative meshes. (#30003)
* suture

* tweak

* bio 6 -> bio 7

* tweak bleed supression

* review

* Update code/game/objects/items/stacks/medical_packs.dm

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-08-17 20:12:44 +00:00
Seren Highwater.
207695cbda Adds Turtlenecks for Various Command Members. (#29948)
* add sprites

* obj

* CMO turtlenecks

* turtle code

* CODE

* everythig

* fixes

* HOP FIX

* super fix ultra fix look at this fucking fix

* done

* config fix

* tiny fix

* test

* test 2

* desc

* hop desc

* Move all the non-weapons out of code/game/objects/weapons (#29820)

* Update bartender mob and obj sprites for relevant species (#29889)

* Update bartender mob and obj sprites for relevant species

* Add bartender uniform rolldowns, inhands. Minor color fixes.

* Revert "Update bartender mob and obj sprites for relevant species (#29889)"

This reverts commit afc4389871.

NVM

---------

Signed-off-by: Seren Highwater.  <102489377+SerenHighwater@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
2025-08-13 20:45:12 +00:00
Burzah
a5c2080c9d Fixes nullspace inventory issue (#30092)
* storage test

* an actual fix

* removed wrapper
2025-08-12 08:38:51 +00:00
Charlie Nolan
8ffefd8777 Move all the non-weapons out of code/game/objects/weapons (#29820) 2025-08-06 01:37:56 +00:00