juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,496 Commits 57 Branches 0 Tags
94a9569d8f91849b92e007de4e94de237e6dfe08
Commit Graph

927 Commits

Author SHA1 Message Date
TaralGit
f6da17d7d9 highlights (#9332) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-07-06 19:57:23 +10:00
metalgearsloth
40eecdd78a Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
metalgearsloth
a2a5df1990 Damage masks (#9402) 2022-07-06 17:58:14 +10:00
Nemanja
836c0bb1c4 Zombie Mode [New Game Mode] (#8501) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-07-06 13:42:51 +10:00
Rane
723004a300 Tiny fans for freezers/shuttles (#9451) 2022-07-05 14:54:27 -05:00
ninruB
3c4998649b Make the extra bright lantern actually flash you. (#9387) 
* lantern goes STUN STUN

* fix an awkward extra spacebar

* fixing the lantern as emogarbage suggested

* buffs the usage amount

ngl, 15 might be a bit over the top, but it is several times larger than a normal flash so it somewhat makes sense.

* fixed encoding
 2022-07-05 11:40:19 -07:00
Aerocrux
064e34e9c5 Fix invisible held sprites for capgun (#9390) 
* Fix capgun YAML for held sprites and touch up in-hand sprites

* Remove capgun size to inherit BaseItem size 5
 2022-07-05 10:09:54 -07:00
Peptide90
bc19f52aa6 removes metal walls, adds rusted walls (#8416) 
* removes metal walls, adds rusted walls

* removes 2 metal walls in bagel

* remove metal walls from pillar

* Remove icon from rust wall

* Made welding work

* removes old prototype
 2022-07-04 02:11:47 -05:00
Peptide90
649b94303e Telescreens and big flat screen TV (#8842) 
* first pass wall tv

* telescreen first pass

* adds flat screen television

* removed duplicate assets

* code changes and construction graph start

* Update lv stack to apc

* completed graphs and fixed bb sizes

* Proto update

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-07-04 17:10:29 +10:00
keronshb
d65601f024 Blocking and Shields (#8584) 
* Blocking

* Fixes Bodytype bug

* Blocking Damage Modifier

* Storing bodytype

* Consolidates Stop Blocking code

* Consolidates more methods

* Some cleanup, hitbox fix

* Shield Textures

* Passive blocking modifier check

* Localization, popups, and more cleanup

* Small cleanup

* Relay event

* Fixes a shutdown bug, adds specific containers and sets

* Popups and sounds

* Fixes typo

* Removes whitespace, adds comment

* Some requested changes

* Remove Shared

* Audio fix

* More changes

* More requested changes

* Properly remove on shutdown

* Adds riot shields to seclathes

* SecTech Riot shield

* Constant variable

* Relay transfer to user blocking system

* More destruction behavior

* Adds a shape field

* Riot shield cleanup

* More requested changes.

* Prevents blocking attempt where a user cannot be anchored

* Listen for anchor change

* Unused using cleanup

* More shields.

* Buckler

* Construction

* Linter fix
 2022-07-04 16:31:12 +10:00
Rane
2e90b81910 Freezer fixatmos entity (#9314) 2022-07-02 19:13:52 -07:00
Ablankmann
e6d9c5f622 See-Through Shuttle Wall (#9306) 2022-07-02 19:10:19 -07:00
hubismal
8cdc702aa9 Adds new "Pharmacy" Lobby Art by Solbusaur (#9339) 
* Adds new lobby art, license, etc

* Fix background to be the correct image.

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2022-07-01 19:54:04 -05:00
Rane
e86e6a5cce Port research disks from nyano (#9081) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-29 00:41:08 +10:00
ike709
d770eb6a35 Forensics (#8451) 
* Port forensics from nyanotrasen

* port updates

* printing

* Update Resources/Locale/en-US/forensics/forensics.ftl

Co-authored-by: Veritius <veritiusgaming@gmail.com>

* Update Content.Server/Forensics/Components/ForensicPadComponent.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Content.Server/Forensics/Systems/ForensicPadSystem.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Content.Server/Forensics/Systems/ForensicScannerSystem.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* partially address reviews

* comments

* redo the events

* handle it

* rewrite loc

* master fixes

Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-06-27 20:04:53 -05:00
TaralGit
8b0e8915a8 Hand made pistol replacement and inhands for ak and china lake (#9198) 
* hand made pistol replacement and inhands for ak and china lake

* china lake inhands correction

* change

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-27 19:18:01 -05:00
Ablankmann
1af61c5041 Syndicate Shoulder Holster and the Outlaw's Hat (#9147) 
* Syndie Holster sprite

* Outlaw Hat sprite

* Outlaw Hat entity

* Syndie Shoulder Holster entity

* Tweaked sussy toolbox

* Tweaked Syndie Holster

* Outlaw Hat and Syndie Holster to the Uplink

* it was a misinput, calm down

* Tweaked holster so it can only hold weapons

* and ammo too

* fixing conflicts... from my OWN PR....

* Fixed another conlfict

* fix
 2022-06-27 16:25:22 -07:00
Emisse
b7f8a688dd Lighthouse and Waystation posters (#9141) 2022-06-28 01:04:55 +10:00
TaralGit
aaad270146 ak and china lake sprites replacements (#9110) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-25 12:59:10 +10:00
EmoGarbage404
76af659072 Space Cash Sprite Tweak (#9120) 2022-06-24 07:45:32 -07:00
Rane
a1affccc84 Miasma improvements (#9022) 2022-06-24 01:20:52 -07:00
metalgearsloth
2b6c352aff Jetpacks (#9023) 
* Movement acceleration

* tweaks

* Weightless refactor coz fuck it

* CCVars

* weightless movement tweaks

* Some cleanup while I'm here

* dorkpacks

* thanks fork

* fixes

* zoomies

* toggles

* hmm

* yamls

* b

* so true

* Effects refactor

* namespace

* review
 2022-06-24 17:44:30 +10:00
EmoGarbage404
1c7a09b736 Fire Axe [New syndie item] (#9088) 2022-06-23 18:27:28 -07:00
Kara
cc755a2051 Projectile spells + fireball spell (#9058) 
* Projectile spells + fireball spell

* say it with some gumption
 2022-06-23 03:24:50 -07:00
Leon Friedrich
0954efa6ed Fix compatibility mode drunk shader (#9053) 2022-06-22 23:20:39 -07:00
Leon Friedrich
c25f2e6283 Drunk Shader (#8910) 
Co-authored-by: Kara D <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-23 14:33:25 +10:00
Leon Friedrich
bf489adb91 Basic drug shader (#9033) 2022-06-23 14:33:07 +10:00
Leon Friedrich
229627a934 Gas injector visuals & balance (#8963) 2022-06-20 19:04:55 -07:00
hubismal
de544a13ac Adds new "Warden" Lobby Art by Solbusaur (#8985) 2022-06-20 18:58:39 -07:00
Kai Shiba
743b86bfe6 Nun Robes And Nurse Hat (#8681) 
* Uploaded Nurse Hat

* Uploaded Nurse Outfit

* Uploaded Nun Robes

* Edited for Nun Robes

* Edited for Nurse Skirt

* Edited for Nurse Hat

* Edited Medidrobe for Nurse Attire

* Edited Chapeldrobe for Nun Robe

* Removed Nurse Outfit from Review

* Edited out Nurse changes

* Edited out Nurse Outfit
 2022-06-18 15:23:49 +10:00
Morber
cbfcdde8bd Add screwdriver head sprite (#8828) 2022-06-18 13:42:15 +10:00
T-Stalker
f1d9466a41 More kinds of benos (#8849) 
* weh

Multiplies the amount of power used by the battery guns, triple-ish for the laser cannon and a fuckton more for the xray

* weh

* weeee

* Fix the offsets and bb

* remove arc

* rouny

* sound stuff and fix the typo

* Fix dork

* a

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-18 13:33:41 +10:00
TaralGit
0b7d22c168 quickfix (#8942) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-18 13:20:16 +10:00
metalgearsloth
3f989559b9 Cleanup the remainder of dragon (#8881) 
* Cleanup the remainder of dragon

- Fixed some of the niscellaneous changes made to yml
- Made devour use a whitelist
- Fixed spelling

* name fix

* a
 2022-06-16 19:30:49 -05:00
Emisse
e4caedf031 Station Specific Jobs: Reporter and Psychologist (#8865) 
* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json
 2022-06-16 19:28:38 +10:00
metalgearsloth
a18ba5c2b5 Power cell culling (#8814) 2022-06-16 18:37:07 +10:00
CrudeWax
c210239f45 Fishy swarmers: Carp content and Space Dragon! (#7395) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-16 14:14:06 +10:00
EmoGarbage404
9be066a8cb The Rat King [Antag] (#8706) 
* vending machine go spit

* who's da rat, bozo

* fixes

* crown + fixes

* aaaa

* aa

* lololol

* removing vending shit + most annoying fix alive

* paul review

* moony fixes

* sloth review

* Minor diseasesystem fix

* inverse moment

* A

* Also reduce args allocations

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-16 10:53:26 +10:00
metalgearsloth
dfad885e82 Fix large_casing sprite and cobra mag (#8809) 2022-06-13 19:30:15 +10:00
EmoGarbage404
63fd01f3bb Zombie Rework & Polymorph Expansion (#8413) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-12 15:53:13 +10:00
TaralGit
43dc0be57c Revamp guns: Revival (#8675) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-12 12:39:52 +10:00
ninruB
c41b001ae3 Ore bags! (YAML, RSI) (#8425) 
* Adding orebags hooray

* Adds ore bags to salvage lockers.

* no ic in ooc!!!!! (fixed typo)

i managed to type ic instead of id in the yaml file, real

* deleted the ore bags from cargodrobes, the pr lies!!!

* not 100, not 150, should be 200 next, right?

WRONG!!! 175!!!

* adds orebags to salvage spawn salvage equipment boxes
 2022-06-12 11:57:02 +10:00
Peptide90
79c265efb3 Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607) 
* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix
 2022-06-03 22:05:18 -07:00
Moony
fada213a22 Implements item pricing, and piracy. (#8548) 
* Start implementing item pricing.

* Flesh out prices a bit, add the appraisal tool.

* Add prices to more things.

* YARRRRRRR

* gives pirates an appraisal tool in their pocket.

* Makes the various traitor objectives valuable. Also nerfs the price of a living person, so it's easier to bargain for them.

* Address reviews.

* Address reviews.
 2022-06-03 10:56:11 -05:00
Emisse
c87f4ab65c Holofan Projector Upstream from Nyano (#8352) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-03 21:58:18 +10:00
Veritius
237cb3d0b4 Communications Console: The ECSining (#8374) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-03 21:37:35 +10:00
Peptide90
b93286fc61 Emergency Response Team (#6258) 
* Clothing pass 1

Backpacks, hardsuits and helmets pass 1

* ERT Leader Role first pass

* ERT Backpacks (nearly there)

* ERT Backpacks final

* ERT helmets pass 1

* remaining hardsuit sprites added.

* ERT leader ID

* removed duplicates

* hardsuits + helmets entities

* ID + PDA for ERT

* ERT leader role pass 1

* job icons / markers for ERT

* military / ert name dataset

* starting gear pass 1 for ERT

* removed in favor of singular ERT roles file

* ERT mobs for spawning

* ERT spawn points added

* fixed case on ERT name

* Increased ERT access to most areas

* ERT ghost role takeover fixes

* ERT removed invalid parent

* path issue resolved

* more file path fixes

* fixes random naming pt 1

* Buffs ERT hardsuits and integrates helmet

parents ert to syndie hardsuit and adds toggleable helmet

* Adds suit storage slot and cargo access

* Adds backpack fills for ERT

* Updates ERT loadout for filled backpacks

+ other misc changes

* buff ERT backpack storage

* fixes ert jani backpack fills

* tweaks spawn loadout to EVA

* gave centcom official AA

* formatting

* ERT shuttle mapped with spawners

* update access
 2022-06-03 20:48:28 +10:00
Peptide90
05c701975b Post Light sprite fix and state (#8578) 
* adjusted post light sprite and added empty state

* update construction location
 2022-06-02 15:12:23 -05:00
Peptide90
8d9b56fce6 Goon floor pack 1 (#8267) 
* floors boxing, arcadeblue2 and carpet clown

* adds gym, metaldiamond and carpetoffice from goon

* adds variants for boxing and gym

* tile variants updated
 2022-06-02 12:10:58 +10:00
metalgearsloth
fb943a61dc Gun refactor (#8301) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-06-01 19:59:58 +10:00