Commit Graph

245 Commits

Author SHA1 Message Date
null 466351abd3
Do the thing for the things (UI prediction stuff or something) 2024-05-03 00:18:25 +02:00
Null 511685e7b6
Revert "Railgun" (#1155)
Revert "Railgun (#718)"

This reverts commit c0de272a13.
2024-04-29 19:55:00 +00:00
Firewatch c0de272a13
Railgun (#718)
* test

please work

* cleanup

removing old assets causing issues

* addition to uplink

both traitors and nukeops can buy this absurdly powerful cannon

* Update railgun_ammo.yml

* laser variant

shrimple as adding a new variant with two firemodes, overkill, and overkiller

* laser railgun cleanup

fixing some trash

* adds the caninator

shoot cans and scare security

* admeme variant and removal of clown variant for now

* Slowdown in Hands

Slows you down when any variant is held as to make the weapon more balanced

* Laser railgun Sprite

adds a unique sprite for the laser variant of the railgun

* fix the sprite

i am dumb

* Issue Cleanup

Dusts off some of the code and makes some balance changes, along with better parenting.

* purchasable ammo and charge sound update

made the charge sound slightly less annoying and added ammo purchasable by both traitors and syndicate

* QA pass

various little fixes to improve the code and general cleanup

* error fixing

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Sprite Update + Reverse Engineering

This adds reverse engineering, the new sprites, and a host of balance changes.
- The Railgun now does 80 stamina damage again on hit with normal bolts.

* reverse engineered fast firerate

as a reward for researching new technology, you've made it slightly faster. yay. also resprites the non-lethal variant to look more plunger-like

* Final Changes

ready for merge, sir!

* Copyright Update

Makes the sounds all under free use creative commons to avoid copyright issues.

* Update license.txt

* remove old attributions

this sound has been altered as to not use pixabay

* price increase

sorry danger but 14 tc is way too low lmao, nukies get it for 20 tc

* requested changes

hopefully

* conversion to mono

yipeeee

* fix of that other fix for the new file rename shit

pure agony

* proper noun

the Decimator is now a proper noun similar to other weapons

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/railgun.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>

* Update duffelbag.yml

* Update uplink_catalog.yml

* Update rod_impact.ogg

* Update uplink_catalog.yml

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-04-29 10:16:53 +00:00
Tad "Taddy" Johnson 1005293925
Upcate Vulcan (#1139)
Now features an increased fire rate and selector. Watch your fire, though, it kicks.
2024-04-28 22:37:30 +02:00
no 29b3303d53
Add awoo emote to vulps (and harpies) (#1094)
* Add awoo as howl trigger

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>

* Actually add awooing for real this time

---------

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2024-04-25 11:43:24 -05:00
Velcroboy e3e7652695
Reduce inventory of unlocked Booze-O-Mats (#1127)
* Reduce inventory of unlocked Booze-O-Mats

* drinkglass 10->15

* remove excess data

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-23 21:50:33 +00:00
Velcroboy 7422c86cbe Update DV windoors 2024-04-22 12:03:31 -05:00
NullWanderer b0c57c9042
Various yaml fixes hopefully
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
2024-04-22 17:59:42 +02:00
metalgearsloth e9c674bcb0
Fix merg conflict (#27080)
bo

(cherry picked from commit 126f64a9149fde473c47cf92e170648e974964df)
2024-04-21 22:25:42 +02:00
NullWanderer ade6e60948
Remove ClothingEyesHudSyndicateMed in favor of ClothingEyesHudSyndicateAgent 2024-04-21 22:11:04 +02:00
NullWanderer b88e0a7606
Folded bodybag migration 2024-04-21 21:43:08 +02:00
KittenColony 303253029f
Smoke.mp4 (#931)
* added De' Jure and Sugar Rush cigarettes

* making life easier in the future

* candy carton :)

* trying to get this to work

* !!!

* YOU CAN EAT EM NOW >:D

* added to cig machine / loot spawners

* # DeltaV (thank you Death)

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>

* thank also

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>

---------

Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-04-19 02:51:31 +00:00
UnicornOnLSD ffd1e968c8
remove duplicate "classic crewcut" (got upstreamed) (#1085)
remove duplicate "classic crewcut" as it was upstreamed
2024-04-18 12:33:40 -05:00
Adeinitas ffe45ec76f
Mr. Butlertron can now be vinced (#1100)
* Adds "Anchorable" and "Pullable" as a test.

* Now the nuke should kill him

* 10000 damage to break him was too much.
2024-04-16 15:45:18 +00:00
Velcroboy 09b937b64f
Fix Access: second act (#1095)
* Fix Access: second act

* copy/paste goof

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-15 19:38:03 +00:00
no d8b97e8d37
Randomized lollipop and gumball flavors (#1074)
* Give lollipops and gumballs random flavors

* RandomizedCandy: Fix borg lollipop action

* RandomizedCandy: Play sound when candy is fabricated

* RandomizedCandy: Lollipop can now be put in mouth

* RandomizedCandy: Quieten fab sound

* RandomizedCandy: merge icons and reexport without pHYs chunk

should speed up downloading these textures on 9600 baud modems

* RandomizedCandy: loads more flavors and update description

* RandomizedCandy: Fix duplicate candyFlavor IDs

* RandomizedCandy: Fix attrib and preserve flavor order

* RandomizedCandy: init on MapInit instead of ComponentInit

* RandomizedCandy: Fix minor code style issues, file placement

* RandomizedCandy: put new code into DeltaV namespace

* RandomizedCandy: Removed redundant datafield tags

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>

---------

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>
2024-04-14 16:48:59 +00:00
deltanedas a6bbbd5308
fix deltav door access (#1071)
* fix deltav door access

* Rerun tests

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
2024-04-11 18:26:25 +00:00
Velcroboy ca1173a4dd
Makes asteroids great-ish again (#1079)
* Makes asteroids better?

* remove unfinished prototype

* oops

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-11 13:25:42 -05:00
Null 306d7f884f
Spare ID cabinet will no longer drop a card on destruction (#1078)
* Update safe.yml

Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>

* Fix Indentation

---------

Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
2024-04-11 12:47:31 +00:00
rosieposie 955130bcaf
Breaching Charges (#1056)
* initial commit

* one tile
2024-04-09 22:11:21 -05:00
Adrian16199 8eb4ea389a
Fix Ifriit ghost role showing up as unknown (#1055)
Fixes the hijacked issue
2024-04-09 22:07:19 -05:00
Null 450434ed14
Merge pull request #1060 from NullWanderer/2024/04/07-merge-master
2024/04/07 merge master
2024-04-09 09:23:49 +02:00
rosieposie 7c2fb9e6fe
Unlocked Booze-O-Mat (#1025)
initial commit
2024-04-08 08:33:46 +00:00
NullWanderer 8335203b4c
Pro 2024-04-07 18:21:08 +02:00
NullWanderer bd47164e95
Merge remote-tracking branch 'upstream/master' into 2024/04/07-merge-master
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Books/lore.yml
2024-04-07 18:14:38 +02:00
deltanedas 5a262ae2b3 move fishops manual to deltav 2024-04-07 15:14:42 +01:00
NullWanderer b5a6229501
Final yaml fixes 2024-04-07 15:30:30 +02:00
NullWanderer aff5fec56c
Various fixes, I got lazy so its all one commit now 2024-04-07 15:13:36 +02:00
Nemanja 00589754f5
Use nav beacon locations for announcements (#26437)
* use nav beacon locations for announcements

* :thumbs_up:

(cherry picked from commit 766192f4b509ff6bfc02ee1c665f1ba5b1bdc831)
2024-04-07 14:07:12 +02:00
Adrian16199 d87b4b048a
New horns for oni. (#1030)
* New horns for oni.

* Update meta.json

* That one cursed lack of space

* Do what was requested

* Update meta.json

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-04-04 14:43:47 -07:00
Fluffiest Floofers be0d84458a
Update custom drinks (#993)
* fix dulleaveanee icon weirdness

hmm yes 13x17 sprite

* First batch

* fixes

* imsmart

* elp

Some DV drink sprites are way too different from the base game sprites

* oops

* soju and sake

* fix flavor

* small fix to kvass
2024-04-04 12:06:01 -05:00
Adrian16199 1922f26d59
Fixes security hud going blank (#1052)
Someone forgot to put Textures in the path
2024-04-03 13:52:37 +02:00
Fluffiest Floofers c01d0cb4dd
Fixes missing Weh emote on species (#992)
* Add bunch of missing emote sounds

I know 80% of them are unused since no more diseases but base game species still have them so until then.

* Mothroach is no longer used

* actually nah

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-03-28 18:27:42 +00:00
Velcroboy 40eeef24e7
Remove warp point comp from map beacons (#968)
* Remove warp point comp from map beacons

* Shorten a few names

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-03-27 23:53:19 -05:00
Null 668488e74b
Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v into 2024/03/23-merge-master 2024-03-27 17:22:41 +00:00
Velcroboy 3dea418e7e
Separates DV-added airlocks into DV files (#1002)
Separate airlocks

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-27 16:44:21 +00:00
Velcroboy f304804365
Undo warp-strings (#1013)
* Bandaid warp point strings

* thing

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-27 11:40:16 -05:00
Null 0cdd16bc4d
Convert to Unix 2024-03-27 11:05:48 +00:00
Fluffiest Floofers c278c3fec0
Lunchbox size fix (#998)
* prevent funny meta

* Totally didn't forget about drinks

* damn chocolate bar

* big but less and more or something

* while im here fix the empty orange carton

Apparently people don't want empty orange cartons???

* juicebox + more random stuff

* fix that
2024-03-25 10:13:19 -05:00
NullWanderer 842145e105
Apply departmental wire layouts to custom doors 2024-03-24 00:07:44 +01:00
Velcroboy 2ad986dddd
Adds pre-set warp points (#991)
* Adds pre-set warp points

* Trim yaml

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-21 20:35:14 -05:00
rosieposie bc19445e42
Submarine Patches 2/10 (#809)
* various retooling

- moved bar & arcade to food court
- retooled west wing of hospital
- fixed atmos markers in gas area
- fixed some misc emergency lights, lowered overall emergency light amount in maints
- removed barbershop, laundry made smaller and slid over a bit
- epi gets their maints back for real
- SIX SMES's. power problems better be fixed or im eating my hat
- removed any labyrinth loot of value pending a full labyrinth redo out of scope for this patch
- WIP supply room for the big hole left by the old bar & arcade/cafe area

* minor touchups

* Update submarine.yml

- added a park substation
- minor tweaks & cleanup

* remove unnecessary extra SMESs

* fix erroneous tiles

* fixgridatmos & variantize

* Update submarine.yml

- added a central hospital substation
- retooled the sec & engi outposts
- labyrinth REMOVED.
- made the robotics room """bigger"""

* sorry prototypes file

* Update submarine.yml

- bingus room
- ai containment room
- minor tweaks & cleanup

* minor fixes again

* cave time

* further refinement of cave area

* old xenobio lab

* decal'd up

* 1 more light

* glass airlocks in xenolab

* ICU door & cave prison

* Update submarine.yml

- added some railings / line stuff
- borg chargers at logi lobby
- fixed some tiles
- retooled ICU a little

* signage babeyyyyy

* Update submarine.yml

removed laika, added SOME stalagmites but not all

* Update submarine.yml

stalagmites, sec main area rejiggering, detailing

* button fixes

- made all buttons directional
- named janitor service light buttons
- added some missing jani lights

* stuff

- moved brigmedics room into sec
- moved detective out of sec
- prettified more substations
- added martial artist, tweaked some crew numbers

* custom escape pod

* custom evac shuttle - NTES Propeller

* fix some wiring on evac shuttle

* rotate some items & telecomms added

also intercomms

* more room at arrivals in case evac shuttle flips

* swap to metem machines

* strengthen armory

* armory touch-ups

* a treat for the warden

* fix stinky decals

* added laser box

and fixed armory more and also apparently never added the metem machine ??????? i swear i did this, must have not saved it

* add secondary sec entrance

also added some posters

* swap armory & wardens room

* armory touchups

* Update submarine.yml

- added blast doors to holding cells
- fixed corpsman door
- added some more cameras
- stuck some secret doors around
- added ninja bombing targets
- minor touchups

* fix some connections

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* sec checkpoint 2

* minor fixes + panopticon

* fix power near arrivals

* missed two wires fuck

* Update submarine.yml

* atmos maint changes

* more external access points

* camera monitor fixes

* fix area around camera router a bit

power, etc

* fix test failure

PROTIP: dont throw darts

* inconsistent windows at bars

* Update submarine.yml

* Update submarine.yml

* retool cargo dock significantly

* single tile that was gonna annoy me

* forgot lights oops

* Update submarine.yml

* improved ICU way more

* Update submarine.yml

- contraband crate
- minor ICU touchups

* minor fixes

* cloning room tweaks

* decal'd up the bar
2024-03-19 18:50:02 -05:00
rosieposie 304fdcd356
Add Corspman Access & Airlocks (#892)
* add corpsman access & mantis maint airlock

* fine

* accessible guy

---------

Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
2024-03-19 13:13:13 +01:00
Debug 9ad761ae18
Lunchboxes! Revival (#980)
* Adds Sprites, courtesy of Noctrn

* Adds lunchboxes

* Adds the "notes from mom" that can spawn inside

* Adds to vendors.

* shrunk storage by one row

* update the locale to have "note from mom"

* new sprites :O

* Update lunchbox.yml to have higher price

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Update chefvend.yml

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* why the fuck did they remove tap.ogg?

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* update credits

* One RSI, many states

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
2024-03-19 12:39:39 +01:00
Debug fed10b87a4
Merge pull request #973 from DebugOk/2024/03/15-merge-upstream
Merge upstream
2024-03-17 18:09:43 +01:00
Debug 0e62b240b8
Uplink 2024-03-17 15:47:30 +01:00
Debug fad821db3e
Silly stamps parts 2 2024-03-17 15:43:49 +01:00
Adrian16199 cfe2e712d6
A small change to ifriit. (#972)
Basicly adds playtime requirement to ifriit and makes them unable to die from bleedout (cus they are a floating rock)
2024-03-17 14:09:23 +00:00
Debug d3c23632e9
Add Psychologist stamp back hopefully 2024-03-17 15:05:42 +01:00
Debug 000d55c932
Revert "Psychologist & Lawyer stamp (#849)"
This reverts commit 344aa7bff7.
2024-03-17 15:02:07 +01:00