New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes #6951
+623
−226
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
github-actions
bot
added
Sprites
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
Blundir
requested changes
Aug 19, 2024
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Blundir
requested changes
Dec 19, 2024
Blundir
removed
the
Sprites Frozen
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
3973836: maps/map_files/CORSAT/Corsat.dmm Automatically commited by: tools\mapmerge2\fixup.py
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
1069779: maps/map_files/BigRed/BigRed.dmm Automatically commited by: tools\mapmerge2\fixup.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
This series of PRs is oriented on adding and updating "in_hands" icon sprites that you can find in-game. This pack does not have an specified number of in_hands and, as so, have now quite a good chunk of them.
The "on_mob" Radio Telephone Pack versions have been updated to look better and to have a "ring" version, so the telephone will not disappear when someone is calling you. Also added an updated version of the chef's hat and to the fireaxe when kept in the back (now it does look better).
This PR also ports Amory's new books, folders and notepads, of which also have their in_hands added by this PR aswell.
This PR also updates and refits scabbards to look better/combine with the new in_hands of swords.
This PR also updates the wooden table's dropped sprite, now looking much more similar to the installed version (In_hand for it included).
Down below, you will be able to read some of the in_hands that this pack currently have:
Explain why it's good for the game
Do I really need to fill this one?
Photographs and Full List of Items
Screenshots & List
Clipboard
Binoculars (All camos)
Mortar Shells (All types)
Space Cleaner Spray
Plant B Gone Spray
Plastic stack
Anesthetic and OT canister tanks
Flashlight
Lantern
Mortar (All camos)
Breaching charges
Defibrilator
Adv. Defibrilator
Gun cases
Traditional USCM MRE
Janitorial bucket
Mop bucket
Updated medkits of all genres
Updated the ancient bucket
Updated both existing-knives icons
Toolkit
Updated Labcoat
Updated the entrenching tool to be bigger (the thing is funnily small)
Updated Firesuit
Updated Radiation Suit
Updated the Biological Suit
Syringe case
Surgical case
Command Tablet
Stasis bags
Body bags
Updated Fork an Spoon / Make both normal and plastic types
Updated glass shards icon
Whiskey bottle
Rum bottle
Kahlua bottle
Sake bottle
Empty glass
Iced tea glass
Screwdriver glass
Lemonade glass
Brown glass
Orange glass
Red glass
green glass
All cream and juice cartons (Orange, Pineapple, Lime, Tomato)
Milk and Soymilk cartons
Water paper cup (Empty and with water)
All types of flasks
All coffee cups
Tables (Disassembled, all types)
W-y Water bottle
sandstone sheet stack
Updated all toolboxes (Including missing syndicate one)
kitchen utensils
Updated the fireaxe's proportions when being hold with a single hand (The thing looked more like a hatchet)
Add in_hands for all material stacks (Silver, Uranium, Phoron, etc)
Soaps
Egg
Tactical Wirecutters
Pill bottles
Beakers
Dropper (Both icons for full and empty, not working as intended yet)
Vials and vial boxes (all states, but not working properly yet)
Chemical bottles (All types, only one currently used)
Bounced Radio
Updated the souto cans (Too small)
Updated paper
Books, Folders and Notepads
Splints
Bandages
Trauma Kits
Burn Kits
Oilment
Candles (All states, but not working properly yet)
Matches (All states, but not working properly yet)
Cigars
Pipes (Both normal and corn)
Ashtrays (Plastic, Bronze and Glass)
All zippo lighters
All cheap lighters
All surgical tools
Synthgraft
Suture Line
Trashbags (New dynamic states, but not working properly yet)
Stack Sheets for all remaining materials (Gold, Cooper, Aluminium, etc)
Re-purposed an older sprite for circuitboards (Doesn't look bad at all, even being old as the devil)
Updated energy cell (Now looks a little bit more with the modern counterpart)
Updated fire extinguisher (Now its bigger, like how an actual fire extinguisher would be)
Hunk bar, Chunk bar, Bonnie bars, Barcardine Bar (Both closed and open)
W-Y Chips (All types, even the currently unused ones)
Kepler Chips (Both hot-chilli pepper and normal)
Burger, Hotdog, Burrito (Both closed and open)
COOKIE!!!!!
Flour, Sugar and Rice packs
Updated both donuts (Now they look a little bit more with their modern counterparts)
Updated Taser (One day we gonna have totally dynamic tasers, for now its an updated version with wielding)
M81 Grenade Launcher (Updated and with new wielding sprite)
All Matebas (Updated and with new wielding sprite)
All Deagles (Updated and with new wielding sprite)
MAC15 (Updated and with new wielding sprite)
Unwielded Fireaxe (Made larger and more similar to the wielded counterpart)
Light replacer
Updated gasmask
Diskettes
Mouses
Updated seasoning bottles
Updated all janitoring items
Christimas gift
Wrap paper
Trophy Cup
All pizzas (including slices)
Pízza boxes (All states, all stacks, open and closed)
Condiment Bottles (I couldn't resist leaving them without icons if I could port them)
Meat pie (same as normal pie, but made with meat)
Balaclava (Quite generic right now, but its much better than nothing)
In_hand for carrying Monkeys, Farwas, Nearas, Stoks and Corgis (All need to be coded in)
In_hand for carrying corgis (Small corgi, Normal corgi and Lisa)
Shaker and vacuum flask (bar stuff)
Tequila bottle
Bottle of wine
Ale bottle
"manlydorfglass" (I don't even know what it is made of)
Salt and pepper shakers
Holy flask (I know its still used in some situations, Queen's batism needs to be charmful)
Assemblies (Igniter, Timer, Prox, Voice)
Plastic bag
Updated stunbaton
Updated Hatchet
Updated metal and wood bats
Updated machete
Updated classic baton
Updated katana
Updated mine sledge
Flash device (Old-school one)
Cerimonial saber (Finally huh)
Updated the Saber's scabbard
Updated the Katan's scabbard
Updated both baton and classic baton belt/suit-slot icons to match the new ones
Updated all belt and suit-slot icons for emergency oxygen tanks
Updated stunprod
All hazard vests (Orange, Blue, Yellow, Black)
All pickaxes
All shovels
Working Joe PDA
Updated blueprints
Updated welding goggles
Bimex shades
Monocle
Security sunglasses
Health HUD
Eyepatch
Aviator glasses
Facehugger
Laceup Shoes (Black, Brown)
Tile
Updated basketball
Added most of the human-body organs (brain, heart, lungs, etc)
Added all skeleton parts
Added boxes and other storage comparments
Updated the circuit board (the book wasn't gonna cuit it)
Added synthetic reset key
Added autoinjector (only one version)
Added both surgical trays (normal and empty)
Updated old-style health analyser too look like the current one
Updated all cigars in_hand and onmob, now they are similar to their normal counterparts
Added Pred burn and brute powder bags
Added throwing, plastic knives
Changelog
🆑
spellcheck: Fixed typos in the "items" file, where on the proc to "zoom", the text had an extra "the" that resulted in a wrong display on chat.
add: made facehugger visible on helmet
add: mouse can now be equipped on ear slot and head slot, in ear slot it'd be seen as sitting on your shoulder
code: Changed the combat flashlight's light range to 6 tiles instead of the normal 5, to make it actually a little better than a normal flashlight. Added a yellowish light color to the lantern (which can be found in colonies), to make it more unique.
imageadd: Added new and updated "in_hands" icon sprites, with the list being, but not limited to: Clipboard, binoculars (All camos), mortar Shells (All types), space cleaner spray, plant B gone spray, plastic stack, anesthetic and OT canister tanks, flashlight, lantern, mortar (All camos) and more.
/:cl: