* Update items.dmi
* Makes botany healing better
* New new sprites
* Made medical.dmi
Made medical.dmi, moved icons there, deleted them from items.dmi. Made sure that affected items pointed to the correct place.
* update
* h
* Update items.dmi
* These shouldn't be here
I don't know what these are or why these are here
* Update medical.dmi
* Please merge 23876 first thanks
* whoops / fix
* she snakes on my case till I
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* deconflicts, ready for TM
* Update code/_onclick/click.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* lewcs good to them
* icon move and changes
* almost forgot to save this
* Update augments_arms.dm
* Inverted it, it seems.
* fixes lockers
* razorwire failsafes
* fuck
* razorwire one hand
* removes 2hand implant stuff
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* s34ns changes
* Vampires can gain blood for a minute from people who succumb
* Revert "Vampires can gain blood for a minute from people who succumb"
This reverts commit 50a3cf87fe.
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* initial addition
* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise
* adds TRAIT_SUPERMATTER_IMMUNE & gloves
* adds more checks for the supermatter immune trait
* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs
* makes slivers bulky
* dusting downed people
also removing a useless assigned variable i missed
* adds the (incomplete) loadout
* halberd buff
* adds robes + sprites
* oops
* halberd icons
* knockdown
* stuff
* timer shortening
* species sprites part 2
* animation for dusting walls
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* early return
* parry numbers!
* Update code/modules/power/engines/supermatter/supermatter.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* dgamer review
* dgamer review + no more pulling
* reverts early return thingamajig
* Update code/modules/power/engines/supermatter/supermatter.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* removes `get_turf`
* hal review pt 1
* hal review pt. 2
* Update code/game/objects/items/theft_items.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* `carve_sliver` proc
* unfucks icons
* Apply suggestions from code review
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* Update lighter icon state code
This commit adds a new `update_icon_state()` method which updates the
held icon sprite with the appropriate sprite for lit status before
updating the graphic, and drops the use of explicit icon_state
definitions for lit/unlit in favour of consistently named sprites for
lighters.
As no "lit" graphic exists for held zippos, nor sprites for other
custom or base lighters, updating of 'item_state' has been removed which
fixes#21257.
The naming of zippo sprites has been updated to reflect this change and
stay consistent with the base lighter object and sprites.
* Add missing sprites for colored zippos and lit state
This adds copies of the base zippo sprite for spiters to work on when
updating for custom held zippo combinations.
* Adds held sprite references for custom zippos
This change adds in overrides for item_state for zippos that differ from
the base silver model, which include:
* zippo-gold
* zippo-blue
* zippo-black
* zippo-red
* zippo-purple
* Update held item sprite for lighter lit status
* Set parent items file for fluff lighters
* Update zippo sprites with lit and color variations
This commit adds the colorized versions of zippo lighters, as well
as including the lit animation ported over from TG appearances,
with variations applied for Paradise flame colors.
* fixup! Update lighter icon state code
* fixup! Update lighter icon state code
* fixup! Add missing sprites for colored zippos and lit state
* Correct purple held sprite to have blue flame
* Update code/modules/customitems/item_defines.dm
Fixup for ad1b5fb
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: XFirebirdX <xfirebirdx@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* dignitary, human, items, spawning
* garment bag update
* dignitary icons
* ntrep cap
* gloves and hat fix
* dignitary icons part 2 and misc code
* minor stuff
* hat fix from updates also drask and grey suit slot
* minor description discrepancy
* cane resprite
* 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>
* start of mess
* reflect/parries works
* more pog-ress
* temp icons, .33 to 0.4
* more work, sound, rnd, fixes me breaking shields
* removes this since open pr fixes
* better codee
* attack log
* Final changes / sprites by ramon
* fixes issue
* shoot ramon for the white pixel :^)
* But what if it was a purple glass shard
* Fixes the throw parry
* sorry for so many commits, lower callback
* Apply suggestions from code review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Early return, no need to typecast
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* test
* holdup
* more guns
* EVEN MORE CHANGES
* fuck
* eugh
* actual shit editor, love DM
* i think I just need inhands now
* final review, test pr
* ooops
* holy shit
* new maka
* foamforce new makarov
* this is going to be hell to review. is it?
* AHHHHH
* small melee fixes
* GOD DAMN STAFF
* as above
* i thought i fixed you, also grip added to wt550 inhand
* acutally deconflicts with the new camera pr, removes the new animated missle(rip)
* some fixes
* a bit more sprite cleaning
* i am suffering
* reverts 9mm
* seemingly forgot a few
* i think we're good now
* New Sprites
* it looks like a duck
* i have no idea what i'm doing .jpg
* tweak and fix conflict
* inhand fix
* fix merge conflict final one pixel tweak
* I promise i'm done tweaking
back to the #6b36c13 design sort of. it just looks better and cuter
* Updating Fire Extinguisher sprite
* modified the tg sprites to look less hexagonal
* how was the silver stripe missed on the original inhands?
* new mini extinguisher sprite
* removed the atmos flavour, now they're just basic mini exitinguishers
* inhand update
* Fix Merge Conflict
Hopefully I did this correctly :P
* fix conflict round 2
* conflict fix round 3
* pure tg sprites
AffectedArc07