Commit Graph

2243 Commits

Author SHA1 Message Date
Linus Wacker
47a642cf22 fixes aloe cream splitting (#8949) 2022-06-19 04:13:11 -07:00
Rane
a527658f6d Miasma update (#8943) 2022-06-18 22:51:55 -07:00
EmoGarbage404
39d439795f Rat King Tweaks (#8940)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-06-18 16:21:07 -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
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
Kara
cbd5abb698 Mobster accents for rat king/servants (#8927)
* basically perfect

* oops

* huh

* new substitutions from retequizzle, rane, and olddancejacket + crown accent

* fixes
2022-06-17 19:36:19 -07:00
Peptide90
5f393963a3 Botany + engi belt whitelist update (#8939) 2022-06-17 19:13:29 -07:00
Rane
1dc78ec88a Port miasma from nyano (#8926)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-06-17 00:00:23 -07:00
Rane
b44ec9554a Disarm 1984 (#8872) 2022-06-16 22:37:07 -07: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
Peptide90
661b31c7a9 reduced duck yaml bloat (#8858)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-06-16 19:59:19 +10: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
Rane
50896fb7ce make animals gibbable (#8875) 2022-06-16 19:25:50 +10:00
metalgearsloth
cf06d1d98c Fix carbine size 2022-06-16 19:18:51 +10:00
Peptide90
bc1e6e9a71 Reduced laser pistols to 10 size (#8840) 2022-06-16 19:16:53 +10:00
keronshb
bb4318b6f1 Fixed rotation check for pulling (#8845)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-16 19:15:56 +10:00
Peptide90
96741fbfc0 Individual bar sign entities (#8159) 2022-06-16 19:13:11 +10:00
metalgearsloth
2a828c23f5 Fix powercell (#8882) 2022-06-16 19:06:15 +10:00
metalgearsloth
a18ba5c2b5 Power cell culling (#8814) 2022-06-16 18:37:07 +10:00
metalgearsloth
b037e5d01e Make holofans use power cells (#8813) 2022-06-16 18:30:27 +10:00
metalgearsloth
e9fc7594b0 Fix damagestatevisualizer (#8879) 2022-06-16 17:56:00 +10:00
metalgearsloth
feb40c7b2c Nerf gun damage (#8853) 2022-06-16 16:15:08 +10:00
metalgearsloth
1e82d0c7ed Add docking window to shuttle consoles (#8756)
* lewd

* A

* Realtime

* Sleepy dork

* Draw radar position

* Accurate infiltrator

* experiments

* Better drawing

* Labels

* I need aan adult

* Cleanup

* Show toggles

* display I guess

* A

* fix

* fix

* cleanupsies

* Bit more polish

* Make sure mass scanners actually work

* Remove dummy state

* fren

* opposite

* aghost crash

* comment

* What's in a name

* woops

* Show docking ports

* Dock highlighting

* Drawing dock

* Shitty docks

* Lots of docking drawing

* Autodock working

* dork

* More graceful shutdown

* zoomies

* Lines and distance change

* revert

* Good enough

* cleanup

* Fix default range

* Dock UI and loc update

* Update on undock

* Loc fixes
2022-06-16 15:28:16 +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
Delete69
2e6b996037 Increase fireplace brightness and radius (#8870) 2022-06-15 18:02:51 -07: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
Emisse
e9a6f6dd93 39 buried 0 found (#8856) 2022-06-15 15:27:45 -05:00
metalgearsloth
0dc8b85ec1 Fix grenade whitelists (#8851) 2022-06-15 17:05:35 +10:00
themias
b4ecf8a7ec Syndicate gas mask flash protection (#8818)
* Syndicate gas masks protect from flashbangs

* fix var name

* update to loop through all slots

* update based on review comments
2022-06-15 17:04:52 +10:00
KIBORG04
a75a921955 Removal interaction without hands (#8843) 2022-06-15 11:39:43 +10:00
keronshb
038d534d60 Guns will now eject magazines first instead of chamber (#8827) 2022-06-14 17:26:59 +10:00
metalgearsloth
63bf83164e Nerf pistol firerate slightly (#8810) 2022-06-14 17:19:51 +10:00
Emisse
bb722f9bd1 Captain laser self recharge (#8826) 2022-06-14 17:13:00 +10:00
metalgearsloth
dfad885e82 Fix large_casing sprite and cobra mag (#8809) 2022-06-13 19:30:15 +10:00
Morber
9849b16e40 Use correct PRGlass parent (#8805) 2022-06-13 17:50:11 +10:00
themias
642b566ce7 Fix firelock prying (#8804) 2022-06-13 13:24:32 +10:00
Jessica M
dabacd5531 Fix winter coats holding more than what they weigh (#8750) 2022-06-12 18:47:58 +10:00
Peptide90
f09cec77a9 ERT Update (#8617)
* removes ert shuttle and adds dartv2 by Schiene

* missing headsets

* makes ghost role sentient

* fixes duplicating helmets

* culling

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 16:17:16 +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
Peptide90
28e96be2e9 Adds new APC types (#8763)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 15:34:16 +10:00
metalgearsloth
47aa0815de Increase gun item sizes (gun nerf) (#8683) 2022-06-12 15:30:03 +10:00
metalgearsloth
7452ff6787 Cull even more map lines (#8773) 2022-06-12 14:12:18 +10:00
metalgearsloth
a983b5e2f5 More container pruning (#8576) 2022-06-12 13:29:03 +10:00
Peptide90
500430a82a Fully remove Saltern Power prototypes / file (#8545)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 13:03:29 +10:00
Peptide90
3b5d2a4e13 Makes asteroids low yield, adds normal yield variant for mining (#8701)
* Adds low yield mining loot table

* adds low yield variant of asteroids
2022-06-12 12:58:34 +10:00
EmoGarbage404
605c7cbb17 layers moment (#8766) 2022-06-12 12:40:14 +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
themias
1e02a97451 Tweak stun batons to use a battery instead of power cell (#8716)
* Allow baton/battery to be inserted into recharger

* Revert "Allow baton/battery to be inserted into recharger"

This reverts commit ccf1f3d1827bf45c49bb6ca4f5c97990d1afba6e.

* Refactor stun batons to use internal batteries
2022-06-12 11:20:03 +10:00
EmoGarbage404
0a90f145bc Fix wrapped foods (chocolate bars, brownies, nutribrick) (#8735)
* wrappables fix

* Update snacks.yml

* Update snacks.yml
2022-06-12 11:06:51 +10:00