diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 33095938da..c3875e2f82 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2311,6 +2311,7 @@ Brute: 5 - type: Item size: Normal + sprite: Mobs/Animals/grenadepenguin.rsi - type: OnUseTimerTrigger delay: 10 beepSound: diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml index 5d1043f08c..fac564392a 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: PowerSink parent: [BaseMachine, BaseSyndicateContraband] name: power sink diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml index a9474cedea..27a6188584 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml @@ -11,7 +11,8 @@ - state: icon map: ["base"] - type: Item - sprite: Objects/Weapons/Bombs/hot_potato.rsi + sprite: Objects/Specific/Hydroponics/potato.rsi + heldPrefix: produce size: Small - type: AmbientSound enabled: false diff --git a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-left.png new file mode 100644 index 0000000000..ac907a4eba Binary files /dev/null and b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-right.png new file mode 100644 index 0000000000..28c621d89b Binary files /dev/null and b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json index 93c4f877cf..0572044d6f 100644 --- a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json @@ -1,21 +1,65 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by EmoGarbage404", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "penguin", - "directions": 4 - }, - { - "name": "dead" - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "penguin", + "directions": 4 + }, + { + "name": "dead" + } + ] } diff --git a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-left.png new file mode 100644 index 0000000000..70839449bc Binary files /dev/null and b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-right.png new file mode 100644 index 0000000000..70839449bc Binary files /dev/null and b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json index 2347b239a1..41a0e45b9e 100644 --- a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json @@ -1,20 +1,65 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + + ] } diff --git a/Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png b/Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png new file mode 100644 index 0000000000..6bb372c8c1 Binary files /dev/null and b/Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png b/Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png new file mode 100644 index 0000000000..6bb372c8c1 Binary files /dev/null and b/Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Power/powersink.rsi/meta.json b/Resources/Textures/Objects/Power/powersink.rsi/meta.json index b4bc0a63f1..f15e188a17 100644 --- a/Resources/Textures/Objects/Power/powersink.rsi/meta.json +++ b/Resources/Textures/Objects/Power/powersink.rsi/meta.json @@ -1,14 +1,23 @@ { - "version": 1, - "license": "CC-BY-NC-SA-3.0", - "copyright": "Drawn by Ubaser.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "powersink" - } - ] + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Drawn by Ubaser. inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "powersink" + } + ] } diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png index 43ead68bb2..fa6333e0b7 100644 Binary files a/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png differ diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-left.png new file mode 100644 index 0000000000..7e65f818ad Binary files /dev/null and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-right.png new file mode 100644 index 0000000000..248d4a3dac Binary files /dev/null and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json index ba7e003575..68e94c6964 100644 --- a/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json @@ -1,32 +1,41 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "folded_extraction" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd, folded sprite modified by mubururu_, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "extraction_point", - "delays": [ - [ - 0.5, - 0.5 - ] - ] - }, - { - "name": "extraction_point_light", - "delays": [ - [ - 0.5, - 0.5 - ] - ] - } - ] -} \ No newline at end of file + "states": [ + { + "name": "folded_extraction" + }, + { + "name": "extraction_point", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "extraction_point_light", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + + ] +}