Commit Graph

2450 Commits

Author SHA1 Message Date
TheRyeGuyWhoWillNowDie
5fece2662c reduces the validhunting capabilities of syringe guns by making piercing syringes not fit into most syringe guns (#16397)
* troll

* h
2022-11-19 14:35:57 +00:00
Theos
46b0edcfaa Update gun.dm (#16511) 2022-11-17 05:30:50 -05:00
Skrem_7
b05478b1d7 boosts american happiness by 3 (#16408) 2022-11-13 15:09:32 +00:00
Molti
8fad1a1f90 Cheese staff now properly reverts after a duration (#16366)
* Cheese staff now properly reverts after a duration

* Cheese doesn't get to commit suicide

* Don't forget the indent

* Forced them to drop their item, also puts them into stasis while in the cheese so they don't slowly suffocate
2022-11-13 14:20:52 +00:00
Skrem_7
68d25ae833 speed consistent (#16360) 2022-11-13 14:16:08 +00:00
Molti
16d65f52b8 MANKIND IS DEAD. BLOOD IS FUEL. HELL IS FULL. IPC MARTIAL ART (#16073)
* MANKIND IS DEAD.
BLOOD IS FUEL.
HELL IS FULL.

* now for the boring update commits

* brings back "Martial" from the comment

* maybe fixes the error?

* should fix the error now

* It worky now?

* adding emp counter

* EMP proof fuckery

* Adding temporary empresistance is a headache

* EMP counter works now
Also gives short term immunity after either counter or getting hit

* All done, except for that one error in the linter

* i might have just been dumb

* Blood is fuel part is improved
Shotgun now causes blood splatters
Variable speed boosts

* adds a dash sound effect

* screen_alert.dmi fixes

* readds the icons
2022-11-13 11:30:23 +00:00
Skrem_7
7ef784c94f Adds K-41s DMR for nukies, adds alternative 7.62 ammunition, overhauls atom penetration code for projectiles (#16191)
* new gun + projectile penetrations

* some name oversights

* orca sprites
2022-10-29 15:06:42 +01:00
ChesterTheCheesy
4aa6c0b45d either destroys the entire game, or increases performance... maybe both (#16178) 2022-10-29 15:02:44 +01:00
ynot01
e9ac61b313 Adds item image previews to uplink (#16195)
* initial

* duplicate & missing sprites

* typo
2022-10-22 14:23:13 +01:00
Skrem_7
187d33a753 Fixes some on_hits that were ignoring shields (#16193)
* selectively makes it so some on_hits can't cheat

* minor miscalculaiton

* minor oversight
2022-10-22 14:17:30 +01:00
Skrem_7
6638ff1574 die (#16040) 2022-10-08 15:06:25 +01:00
ynot01
240bb4c06f Firearms rework again [Modular Attachments] (#16028)
* initial modular attachment commit

* fix bitflags

* Update code/modules/projectiles/gun.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/attachments/laser_sight.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/attachments/_attachment.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/action.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/action.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/action.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/action.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/attachments/_attachment.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/attachments/_attachment.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* use better names

* fix tatax breaking my pr

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-10-08 15:03:11 +01:00
grimm-hollowknight
29ab3f8824 Stechkin APS sprite update. (#15968)
* pistol that the bad guys use

* APS

* fix?

* adds click catchers to the triggers
2022-10-03 14:59:53 -07:00
Molti
d6ae7fc95f Reworks the poor aim quirk and all sources of poor aim to be able to stack (#15847)
* Reworks POOR_AIM and all aiming inaccuracy debuffs to stack

* "Fixed" the issue
2022-10-01 12:50:26 +01:00
Skrem_7
05f6818e94 The Ballistics Expansion (#15675)
* Gee I sure hope this PR never stacks an obnoxious number of cornflakes that force me to make a new PR

* forgot to adjust metalshock description

* i forgot to change magtype of the boarder!!

* USE your sprites damnit

* redundancy my beloved

* mild number tweaks

* first patch

* second patch

* small sprite changes

* third patch

* bullet speed patch

* gives ap to wt incend since it doesnt inherit it unlike the rubber

* makes trac less bad

* minor description oversights
2022-10-01 12:37:37 +01:00
Mqiib
d9cee947c1 delet (#15895) 2022-09-30 19:40:57 +02:00
Mqiib
b2b5b5eb02 screaming (#15845) 2022-09-30 19:18:51 +02:00
Bop
8e47bc8d3c Radiation Anomaly (#15754)
* OH FUCK OH SHIT

* why yes

* hmm

* guh

* yyy

* wh

* sleep

* done

* event spawn

* sprite change

* e

* no

* yessir

* new sprite for anomaly

* hgm

* fuck

* E

* maybe too hurt

* Update anomalies.dm

* Update anomaly_radiation.dm

* too high

* guh
2022-09-30 18:43:00 +02:00
Skrem_7
5fd2cec263 Buffs (most) hardlight bow projectiles (#15642)
* what is balance? a MISERABLE little pile of random numbers! But enough ided; HAVE AT YOU

* balance + desc
2022-09-30 18:38:46 +02:00
TheRyeGuyWhoWillNowDie
4d7bf5b313 Working mech DLC: Clarke and KA (#15626)
* its here

* Update clarke.dm

* Update code/game/mecha/mech_fabricator.dm

* Update code/game/mecha/mech_fabricator.dm

* Update code/game/mecha/mech_fabricator.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-09-10 19:17:05 +00:00
Theos
ae579bbb48 Ballistic guns now won't say they can be unsuppressed if they can't (#15674)
* Update ballistic.dm

* Update revolver.dm (#17)
2022-09-10 21:08:09 +02:00
ynot01
938f32c770 makes bullets fast (#15548) 2022-09-10 20:25:12 +02:00
ynot01
5220003bee makes arcane barrage actually deal more damage than enchanted rifles (#15202)
* makes arcane barrage actually deal more dmg

* poke travis

* revert cult buff

* Update spellbook.dm
2022-09-10 19:49:29 +02:00
TheRyeGuyWhoWillNowDie
9a0189884e THE FIX (#15581) 2022-09-04 15:47:28 +01:00
SuperSlayer
f4291dd2a6 buff (#15575) 2022-09-04 15:43:00 +01:00
Skrem_7
a93c7a3993 .357 Alternative Ammo Update (#15519)
* i will make bullets unique

* spontaneous re-spriting

* updates some comments

* two new ammo types

* Update code/modules/projectiles/projectile/bullets/revolver.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update revolver.dm

* Update uplink_items.dm

* Update ammo_boxes.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-09-04 14:07:34 +01:00
Vaelophis Nyx
7f62e8a941 Renables & Improves Stalwart + Fixes Stalwart's Loot Drop & Improves It + Adds New Stalwart Drops (#15476)
* readds stalwart to the megafauna list

big metal man returns

* holy shit

big fixes

* Update energy.dmi

* Update plasma.dm

* big changes

* Update stalwart.dm

* Update necropolis_chests.dm

* why dont you go wield some bitches

stalwart staff wield changes in prep for new sprites

* Update stalwart.ogg

* Update stalwart.ogg

* Update machine_vending.dm

* Revert "Update machine_vending.dm"

This reverts commit 20dd3c5305.

* Update stalwart.ogg

* Update stalwart.ogg

* Update stalwart.ogg

* shazam!

* Update gems.dm

* 1

* Update stalwart.dm

* forgor the bounty

* oops

* Update plasma.dm
2022-09-04 13:52:55 +01:00
ynot01
30ea933da5 [ADMIN] NT uplinks for ERT (#15355)
* ERT uplink init

* add oxy tank to ert backpack

* add ds hardsuits & fix m1911 mag

* set to just "Commander"

* adds eshield, teleshield, and ds mask to uplink

* add medbeam gun, remove duplicate

* restrict discounts & limit stock

* fix wt dupe

* makes the tommygun wildly inaccurate

* tommy cheaper cause inaccurate also desc

* lets you have two tommy guns

miss me with that ‘weapon accuracy’ shit. im shooting everything. im laying down cover fire. im shooting the walls. im shooting my teammates. im shooting myself. my accuracy is 100% yall just dont know what im aiming at

* makes toolbelt 1 wc

* makes tommy actually inaccurate

* poke turdis

* fixes

* adds ap and incen saber ammo

* add laser rifle, cap eguns

* ds get a little more

* reduce industrial RCD price to 5WC

* reduce RCD to 2 and combat RCD to 4

* reduce medbeam by 1 and limit stock

* ERT leader gets 5 extra WC

* leader gets fancy hat

* Update ert.dm

* fix laser rifle overwriting tac eguns

* set default uplink type

* add mini e gun

* add nt mantis blades

* fix nt mantis

* efficiency or something

* actually mini

* lower mantis to 7

* add armors

* update teleshield desc

* add bowman

* fix paths

* add poster box

* Update uplink_items.dm

* lower recharger cost to 2 WC

* add exclusivity to ert commander hardsuit

* fixes stupid tommygun code

* Update smg.dm
2022-09-04 13:36:54 +01:00
ChesterTheCheesy
d36eda8e77 Gives rocket launcher a pickup sound (#15496)
* gives rocket launcher pickup sounds

* Add files via upload
2022-08-29 12:44:30 +01:00
ynot01
c023bbe3ae adjusts bad guns (brings back revolver to traitors) (#15432)
* bad guns not bad

* cheapen
2022-08-29 12:36:27 +01:00
Theos
826ea85336 KA low pressure damage is halved when on the station z level (#15470)
* KA low pressure damage is halved when on the station z level

* this code sucks
2022-08-29 12:36:10 +01:00
Skrem_7
2227846c06 ammo changes and other funnsies (#15459) 2022-08-29 12:35:14 +01:00
Skrem_7
9c8524ecb5 new sprites new sprites (#15368) 2022-08-20 14:11:19 +01:00
Redmoogle
3c206e7107 Add mini plasma cutters & makes them roundstart (#15310)
* Mini cutters

* Move it to voucher

* lower cost

* that was meant to be WAY slower
2022-08-20 13:36:47 +01:00
ynot01
9e3fa8bc2d akimbo rework (#15309)
* akimbo rework

* makes spread worse
2022-08-20 13:35:48 +01:00
ynot01
41aa506e6c makes enchanted bolt rifle respect antimagic (#15200) 2022-08-14 17:53:57 +01:00
ynot01
a5e6aed15d Mechs can be repaired from destruction, capacitor no longer protects from EMP (#15121)
* capacitor mech repair rework

* typo

* better visibility

* attach the equipment bozo
2022-08-14 17:20:40 +01:00
SapphicOverload
c486310d7e Makes radioactive contamination less contagious (and minor radball tweak) (#15112)
* radiation go brrrrrr

* fixes radiation projectiles not being affected by radiation protection

* makes godmode protect from radiation damage

* e
2022-08-14 17:18:03 +01:00
SuperSlayer
d33dc6eb78 Ports cogger weapons from bee (#14896)
* Update computer.dm

* Update meat.dm

* Update objects.dm

* Update computer.dm

* Update meat.dm

* Update objects.dm

* boowomp

* e

* s

* s

* 3

* rev

* Update antagonists.dm

* Update blob_overmind.dm

* Update radial.dm

* Delete info.dm

* Update overmind.dm

* Update overmind.dm

* Update powers.dm

* Update role_preferences.dm

* Update job.dm

* Update mind.dm

* Update dynamic_rulesets.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update antag_panel.dm

* Update revolution.dm

* Update bureaucratic_error.dm

* Update _job.dm

* Update ai.dm

* Delete anti_union_propaganda.txt

* Update antagonists.dm

* Update blob_overmind.dm

* Update generic_negative_events.dm

* Update _blobstrain.dm

* Update _blob.dm

* Update _job.dm

* amonus

* del

* amogus

* mapping shit

* removes stupid hivemind shit that i forgot to remove from my master branch

* Update traits.dm

* Update objectives.dm

* Update dynamic_rulesets_roundstart.dm

* e

* fork cleanup

* cleans useless shit from the fork

* amongus

* coggers!

* poggy

* s

* fix 2

* Update battlehammer.dm

* Add files via upload

* Update arrow.dm

Co-authored-by: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com>
2022-08-06 16:32:36 -04:00
Skrem_7
fbbaa86641 ratio part 2 (#15069) 2022-08-05 14:10:27 +01:00
Redmoogle
9c046aa532 Ports IPCs from beestation (#14582)
* Switching to another computer

* half way there

* Should compile now but will be missing icons

* )

* ident

* Add 1/3 DMIs

* Fix taste

* Apply changes

* Sprites n stuff and revive delay

* add organ sprites

* More IPC Screens and Antennas

* L + Ring + Fix

* 2 New Eye Screens

* Fixes

* Fixes

* :) + :( + Reorginization

* Hand Sprites (Needs Spriters Work)

* Make the hands look much less retarted

* Ports Morpheus Cyberkinetics Chassis from Shiptest

https://github.com/shiptest-ss13/Shiptest/pull/1181

* remove debug print

* A bunch of fixes

* get out of there code

* Its not an upgrader cyberheart

* Replaces some color screens with Greyscale variants

* Update code/modules/mob/living/carbon/human/species_types/IPC.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Jesus christ burn hits hard

* makes the head decapitable for IPCs

* Retard managed to commit a map

* NO_DEFIB trait and makes emotes work

* revive code

* Update IPC.dm

* Update objective.dm

* IPC Revival Board + Hair Fix

* Gives attach limb a return for limb reattachment

* well fuck you too then

* IPC Organs no longer decay

* Hopefully makes IPC revival work less buggily

* Custom hud icon

* Makes IPCs genderless

* fixes

* Fix starving popup

* Crit fixes and adjustments

* Adjustments & Cleanups

* Update defib.dm

* merge icons

* Update negative.dm

* should fix the rest of quirks + noblood

* FUCK

* Fixes organ duplication

* Removes hemophiliac for noblood people

* no defibbing ipcs fuck you

* moment moment

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-08-05 13:13:10 +01:00
TheRyeGuyWhoWillNowDie
7e96a03bd9 locing mechanism (#14993)
* Update bow.dm

* Update code/modules/projectiles/guns/ballistic/bow.dm

Co-authored-by: Theos <theubernyan@gmail.com>

* Update bow.dm

* Update bow.dm

* Update code/modules/projectiles/guns/ballistic/bow.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-07-28 12:36:12 +02:00
nmajask
360370b599 Surgery tweaks 2 (#14737)
* stasis nerf

* aaa

* a

* a

* pain

* a

* wrapping up

* forgot to revert this

* pretty filter

* ctrl c ctrl v fails me again

* *scream

* spriting

* fex

* dont need this

* Surgical mat nerf

* pain
2022-07-24 12:18:30 +01:00
Redmoogle
6cc4c0e33d Adds more shameful suicides and makes them slightly more immersive (#14930)
* More suicides! yay?

* Apply suggestions from code review

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* More suicides

* Update dice.dm

* fix

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-07-23 18:12:19 +01:00
TheRyeGuyWhoWillNowDie
45c3788cf2 Syndicate hardlight bow buffs (#14900)
* lol

* fucky wucky

* some of the suggestions
2022-07-23 13:46:53 +01:00
Skrem_7
80f5b04502 New tracking revolver (#14687)
* vomit time

* Update revolver.dm

* Update revolver.dm

* Update revolver.dm

* revolver now on belt yay

* long live new caliber

* im a fucming dumbass

* I'm more of a dumbass somehow lmao

* adds new sprites for the gutterpunch rounds

* adds a missing period

* changes up descriptions

* last description change

* seven != six

* almost final description update

* now final description update

* orca told me not to update the sprites yet i fail to see how there is going to be new sprites if it's merged just like that so i'm never trusting them again

* removes gutterpunch from pr

* I hate map shit

* should fix

* should also fix?

* maybe?

* fix??

Co-authored-by: nmajask <nmajask@gmail.com>
2022-07-20 22:26:22 -04:00
Skrem_7
9aaecdc519 Adds .38 Gutterpunch (#14763)
* new separate pr oh boy oh boy

* how the fuck
2022-07-16 07:18:36 -04:00
Bop
9b53e94a6c [PORT] Welding effects (#14727)
* added welding effects

* added effects

* whoop
2022-07-10 18:15:52 -04:00
adamsong
71bb12f09e Refactor cryo item storage (#14704) 2022-07-09 15:26:45 +01:00
Skrem_7
3918be295a Slight WT buff for real (#14683)
* Update smg.dm

* hit the wrong key lmao
2022-07-09 14:30:14 +01:00