Commit Graph
173 Commits
Author SHA1 Message Date
AffectedArc07andGitHub bd91a1b962 Obliterates the RSC (#26498) 2024-08-15 18:20:11 +00:00
765461f14a Bear update, part 2 (#24506)
* The bear update!

* more sprites

* more bearprites

* diversify

* removing comments

* description and mapping

* duplicate

* Update code/modules/mob/living/simple_animal/hostile/bear.dm

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-03-20 21:33:32 +00:00
warriorstar-orionandGitHub 43b3bb0e44 forbid in-DMI icon state name dupes with CI (#22734)
* forbid in-DMI icon state name dupes with CI

* remove final icon dupes

* use shodancoat item_state
2024-03-01 13:12:21 +00:00
ATP-EngineerandGitHub 7df4eac49e Bear resprites, sprite from SS14 by Alekshhh applied for all instances (#24167)
* Deletes old file

* Resprites the bears

* Deletes old file

* Resprites bear pelt hats

* Deletes old file

* Resprites bear pelt hat

* Deletes old file

* Resprites russian_melee bear pelt

* Deletes old file

* Resprites bear pelts

* Resprites polarbear pelt

* Resprites polarbear pelt
2024-02-24 18:17:17 +00:00
cae6017c48 Bomber Jacket resprite + departmental expansion (#23599)
* bomberjackets

* Apply suggestions from code review

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

* minor changes to armour and allowed items

* secbomber description change

* more allowed item tweaks

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-06 21:46:14 +00:00
2ab351cc91 Sprite updates & state fix for zippo lighters (#22150)
* 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>
2023-09-09 13:31:18 +01:00
Pineapple SaladandGitHub b79065618f Updates Dans coat to a better sprite (#19728)
* Updates Dans coat to a better sprite

The way the sprite was originally made was to match the older theme of the game with more flat unshaded textures.

This new version of the sprite is no longer flat, has more details, and is actually shaded, to match the newer higher quality sprites we've gotten.

* Update suit.dmi
2022-12-14 22:19:46 +01:00
warriorstar-orionandGitHub f4cfaae621 Fluff item, ckey: warriorstar (#19648) 2022-11-10 21:12:09 +01:00
AsmerathandGitHub 25fa75d76c Asmerath's fluff item update (#18772)
* fluff changes

replaces Asmerath's fluff accordion into a fluff mask.

* removed accordion
2022-08-13 18:40:09 +01:00
QwertytofortyandGitHub 12c21ced84 Resprites / renames Dan's fluff item (#17252) 2021-12-18 19:23:46 +01:00
LumiandGitHub b5df23090f adds mask, removes mouse (#16712)
removes the clockwork mouse, adds the fluff mask
2021-09-15 21:49:41 +01:00
SabreMLandGitHub 5de0ebddaf plamsa (#16178) 2021-06-17 10:18:17 +01:00
NorsteadandGitHub e81c68fe6c Tweaks fluff item (#15908)
* Tweaks fluff item

* oopsy

* oopsy 2: Electric boogaloo
2021-04-19 15:29:21 +01:00
SabreMLandGitHub 27047385c1 Floof (#15551) 2021-02-21 21:28:26 +00:00
AffectedArc07 62b618dcd4 Merge remote-tracking branch 'ParadiseSS13/master' into removes-red-cross 2021-01-28 21:35:44 +00:00
SabreML 3a677fa266 Icons 2020-09-14 19:51:22 +01:00
AffectedArc07 f142f21a79 Removes another sprite 2020-08-30 08:43:26 +01:00
Lumi 7cc1493c79 Updates fluff.
Updates Vox bodysuit to Kikeri's Dress.
2020-04-17 15:20:38 +10:00
Pineapple Salad 9a1e481c44 Small sprite edits for Dan
http://prntscr.com/p6aq4k

Approved by Neca

small sprite edits to dans fluffs, fixes buggy sloppy guitar sprite with wonky position
2019-09-15 03:44:24 -04:00
Lumi 4dbd68477b Updates Lumi's fluff vox suit sprites 2019-03-26 16:42:02 +11:00
Lumi c587e90d8b Adds Lumi's fluff vox suit
Adds Lumi's fluff vox bodysuit.

Approved by Kyet.

The item is a fluff bodysuit for a vox, sits in the jumpsuit slot, and behaves as a regular pair of athletic shorts would (scarves, etc can be attached, it cannot be rolled down, can be removed as normal). It is animated.

gangelwaefre:voxbodysuit is the phrase needed in custom_sprites.
2019-03-25 22:57:02 +11:00
FalseIncarnate 3c03834571 Benjaminfallout Fluff Item
Adds Benjaminfallout's fluff item: a personalized ring.

Ckey: `benjaminfallout`
Character Name: `Pretzel's Ring"

![ring image](https://i.gyazo.com/b709324b79e2845cae16eb305d7d5cc3.png)

Approved by Kyet
2019-03-22 23:14:52 -04:00
Couls cc7d2606be Update shesi's fluff sprites and add in a custom winter hood to go with the coat 2019-03-12 18:24:04 -04:00
rb303 f1716ed14a fixes conflicts 2019-03-11 02:55:21 +00:00
rb303 26bcfacf2a Fluff Item 2019-03-08 17:49:34 +00:00
Aurorablade ca629f4bd3 Pinapplehairfluff 2019-03-04 22:10:22 -05:00
AffectedArc07 db6629387c Fluff Item 2019-03-01 19:35:47 +00:00
datlo 1caaa600ae add greey's fluff duffel 2019-02-12 00:30:36 +00:00
datlo 9bea70dd49 add comfy coat 2019-02-11 10:56:14 +00:00
Gwydion Brain 7e834d1c03 Resolution 2019-02-08 19:35:35 -08:00
Fox McCloud b29fed6bf9 Fox Fluff Item Coat 2019-02-08 17:11:59 -05:00
lass9030 8b666c84c1 fluff suit 2019-02-07 03:52:55 +01:00
Fox McCloud 5fce6edc0d Skittles Fluff Item--Kiachi 2019-02-02 18:52:43 -05:00
Ionward 14d23a7eb2 ionward_fluff_labcoat 2019-01-27 19:09:04 -08:00
Gwydion Brain cc05eda75e Merge branch 'master' into CheekyCrenando_Fluff_coat 2019-01-25 13:13:20 -08:00
Gwydion Brain b1683380c9 Cheeky's Fluff item
I sold my soul to CM and they won't give it back :(
2019-01-24 01:01:55 -08:00
Aurorablade 425757c3b3 Sprite now has whiskers and not a glow 2019-01-24 01:37:47 -05:00
Aurorablade fb89274c6d PineappleSaladFluff 2019-01-22 20:26:47 -05:00
Aurorablade c5af806268 Asmerath Fluff item, Accordion inhands 2019-01-13 00:53:53 -05:00
Unknown 8cb30b7996 Decemviri's fluff hardsuit modkit 2018-12-18 23:00:15 +01:00
Gwydion Brain 1f6613c289 Initial 2018-11-02 13:31:25 -07:00
Ty-Omaha 2f09512d95 not-spiderman boots 2018-10-11 01:14:14 -04:00
Gwydion Brain 15cb14e28e Conflict Resolution 2018-10-10 11:01:17 -07:00
Gwydion Brain d891504ea2 Initial 2018-10-01 11:24:26 -07:00
DarkPyrolord dd9cbb861d WinterSec 2018-09-28 22:42:38 +12:00
SkeletalElite 238f2db483 Requested Changes and Conflicts 2018-09-27 18:27:13 -07:00
SkeletalElite eb842bcc5d Revert "Resolving Conflicts"
This reverts commit 07de1c1ec4.
2018-09-27 18:18:27 -07:00
variableundefined 1a7461fab7 Actually fixes conflicts! 2018-09-27 17:39:28 +08:00
SkeletalElite 07de1c1ec4 Resolving Conflicts
Another fluff item got merged
2018-09-16 17:23:43 -07:00
Crazylemon64 dadac2c755 E.L.O.'s fluff item 2018-09-14 19:37:27 -07:00