Commit Graph

1432 Commits

Author SHA1 Message Date
S34N
edeba92326 Smoke spells readability (#19387)
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 18:05:55 +02:00
Qwertytoforty
4c13246d30 Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 (#19170)
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5

* grammer / typeblock

* 15 is not more than 15

* how did I miss this, I swear I put in 3

* path + crafting

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-14 08:28:07 +02:00
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
Contrabang
c74af494b3 [TGUI] Temp gun (#19350)
* temp gun temp gun

* formatting

* sirryan review + changed process() for performance

* oops

* fixes radios

* Revert "fixes radios"

This reverts commit e932d63310.
2022-10-12 10:57:27 -05:00
Vi3trice
2d58bc6066 Now you can have proper fancy energy guns (#19272) 2022-10-10 21:07:09 +02:00
Vi3trice
20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
Contrabang
8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
Sheep
b5357494c4 Fix ParadiseSS13#19098, update chassis mod install/uninstall procs. (#19118)
Change the current_skin in chassis_mod/install, not the current_icon.
Same with chassis_mod/uninstall
2022-09-25 17:45:54 +01:00
Adrer
bb12be2ed1 Meteorshot now knocks down instead of stunning (#18955)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-09-03 16:22:14 +01:00
FloFluoro
92f6d88b35 Adds cooldown to Xenomorph neurotoxin, changes stun to knockdown (#18919)
* Adds cooldown to Xenomorph neurotoxin, changes stun to knockdown

* Neurotoxin now works when implanted in humans

* Tidying

* More tidying

* More tidying
2022-08-31 13:19:03 +01:00
GDN
7e595c4a03 Clarifies that DNA injectors cannot be used with syringe guns (#18846)
* Alters DNA-Injectors interaction with the syringe gun

Alters the DNA-injectors interacton with the syringe gun

* dna injector

* Further grammer fixes

I fucked up the grammer on a grammer pr lmao

* adds sirryans suggestion for testing
2022-08-25 16:38:38 +01:00
Edan
baa16534fb PERCENTAGES OVER 100? (#18883) 2022-08-24 18:42:32 +01:00
Bm0n
a78c1e9f12 Adds the Stechkin APS to the nukeop uplink (#18741)
* addAPS

* fixes HP ammo sprite

* hah i forgot the uplink refs

* surplus = 40
2022-08-10 14:21:51 +01:00
Qwertytoforty
b839e02639 fixes weak ion shots... being stronger than normal ions (#18713)
* fixes weak ion shots... being stronger than normal ions

* charl request
2022-08-05 20:33:04 +01:00
Edan
1d552ab0e4 Armour Refactor (#18547)
* initial commit

* bullet fix + 100% armour pen

* equivalent armour values

* percentage armour pen

* updates bombing

* adds more defines

* i like armour too much

* review pass 1

* review pass 2

* updates with lavaland elites

* armour penetration value tweaks

* wt550 AP round change
2022-08-01 20:23:49 +01:00
Viz
9ce38542f3 removes false advertising (#18636) 2022-07-30 20:04:35 +01:00
FloFluoro
b9bfae5009 Adds "antagonist" message when polymorphed into Xenomorph (#18631)
* Adds "antagonist" message when polymorphed into xenomorph

* Changed text type to userdanger

* Oops
2022-07-30 12:15:16 +01:00
Viz
48f02a3987 Balances explosions for stamina combat (#18602)
* whats that beepi-

* no longer can frag-12 nukies with it

* charlie review 1

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* charlie review 2

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-28 22:20:29 +01:00
AffectedArc07
2f5cec832d Cleanup redundant machine stuff (#18494) 2022-07-27 21:25:39 +01:00
Qwertytoforty
cfabb34b49 Adds emp effect to detectives revolver (#18507)
* Adds emp effect to detectives revolver

* Update code/modules/projectiles/guns/energy/special.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-24 17:51:08 +01:00
moxian
e946c0b537 Switch guns and grenades over to /Initialize (#18332) 2022-07-24 11:44:42 +02:00
Bm0n
0e61f8f2ee adds gun counter for wt550 (#18487) 2022-07-22 11:16:48 +01:00
Vi3trice
f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
Viz
a02909497a at long last this weapon is not bonkers (#18388) 2022-07-16 15:36:39 +01:00
Qwertytoforty
45f6f14c64 Now follow up with a glory kill (#18387) 2022-07-16 14:39:13 +01:00
Edan
166d7f3b61 Nerfs beanbags & rubber pellet shots (#18287)
* initial nerf

* rubber shot changes
2022-07-14 23:22:19 +01:00
Viz
a7300d6199 splash one awful gun (#18357) 2022-07-14 23:20:53 +01:00
moxian
f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
Sirryan2002
ebf23682d5 Meathook now uses KnockDown instead of just Weaken (#18255)
* its knockdown time

* weaken tweak
2022-07-10 15:15:35 +01:00
KalevTait
3bd7952ffb guns (#18237) 2022-07-08 09:18:54 +02:00
Bm0n
1d0e3dde0f Updates a considerable amount of legacy weapon sprites to modern TG/Bay versions (#18118)
* test

* holdup

* more guns

* EVEN MORE CHANGES

* fuck

* eugh

* actual shit editor, love DM

* i think I just need inhands now

* final review, test pr

* ooops

* holy shit

* new maka

* foamforce new makarov

* this is going to be hell to review. is it?

* AHHHHH

* small melee fixes

* GOD DAMN STAFF

* as above

* i thought i fixed you, also grip added to wt550 inhand

* acutally deconflicts with the new camera pr, removes the new animated missle(rip)

* some fixes

* a bit more sprite cleaning

* i am suffering

* reverts 9mm

* seemingly forgot a few

* i think we're good now
2022-07-07 17:12:28 +01:00
S34N
52f3323760 makes these lasers (#18209) 2022-07-05 13:41:48 +01:00
Charlie
bead47ea29 Adds crawling. (#17899)
* crawling?

* knockdown. CONTAINS CHANGES THAT NEED REVERTING

* plotting can_moves death

* CANMOVE IS DEAD

* mappers are insane

* removes todos as the are todone

* decreases crawling speed

* silly-con fixes

* surgery fixes

* fixes death

* pAI fixes

* removes var/lying

* runtime fix

* decreases default crawling speed

* correct crawling dir

* some more fixes

* stunbaton tweak, revert later

* rejuv fix

* restraint and incapacitated refactor

* crawling dir in line with TG

* fixes vehicle movement and grabs

* alien rest fixes

* antistun fixes

* fixed fall sounds

* forgor to stage this

* first review

* canmove zombie dispersal

* fix

* lots of fixes

* defines

* fixes the trait helper

* if you got no legs you can still crawl

* sillyconfix

* no reverty keepy

* jaunt fix

* hopefully fixes perma sleepy zzz

* admin rejuv temp fix

* rest canceling

* antistun chems now remove knockdown

* buckle offset fix

* fixes some stuff

* crawling delay = 4

* descuffs bed

* sleeping hotfix

* fixes simple mob resting

* V is the macro for resting

* projectiles no dodgy

* refines the projectile check

* god I hate strings

* MORE FIXES

* I hate buckling

* fixes capulettium plus

* winding down

* farie review

* bugs did stop showing up

* SEAN

* todo

* sean review

* ed209

* i HATE cyborgs

* steel review

* laaaaaast things

* reverts stun baton changes

* and done
2022-06-30 11:57:52 -05:00
S34N
3807bf43c7 [GBP no update] Minor refactor to reflecting projectiles, detgun fix (#18114)
* initial

* change these please

* let it not ignore carp, i suppose

* this instead

* review, fixes

* charlie code
2022-06-28 22:37:04 +01:00
S34N
705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
Qwertytoforty
d9b2a0c4ae fixes being able to break plasma pistols (#18043) 2022-06-22 17:53:58 +01:00
Luc
727b299d33 Rapid Syringe Gun rework (#17816)
* First commit reworking most of RSG

* Fixes, add alternate versions

* Update in uplink, remove from R&D

* Add custom pre-loaded version to uplink

* Fixes message, linter error

* Change initialization of half rapidsyringe

* Some review updates

* Add some sound effects

* Use internal reagents instead of a literal bluespace beaker

* Update rapid syringe description

* Drop RSG to 8 TC

* Update code/modules/projectiles/guns/syringe_gun.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* More review changes, improve messaging

* Update code/modules/projectiles/guns/syringe_gun.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Address reviews

* Remove extraneous check

* Message and documentation reviews

* Syringening

* More review

* attempt to bump CI

* spacing

* last review concerns

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-21 21:26:27 +01:00
Kugamo
944e6d1231 YES (#17946) 2022-06-14 13:32:13 +01:00
Kugamo
7acca3d599 Examine Energy Weapon Charge (#17945)
* BIG DATA

BIG DATA

* SMALL DATA

SMALL DATA
2022-06-14 13:31:40 +01:00
Charlie
77d03f7ab9 Spellblade rework (#17693)
* fire lighting and shielding

* blink + lavaland loot

* file move and projectile removal

* get out of MY WALLS

* review

* sprites

* forgot this

* sprite update

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* some TM changes

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-06-06 16:22:18 +01:00
moxian
a02187e08e Refactor ammo icon handling so that they show on map (#17807)
* Refactor ammo icon handling so that they show on map

.. and are not terrible to maintain.

* Small prettification

* .len -> length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Other .len -> length()

* And the rest of the .len -> length() in the touched files

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-27 20:35:05 +01:00
Charlie
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
Charlie
735c0664f0 dumpster fire (#17736) 2022-05-05 19:52:29 +01:00
Qwertytoforty
2aade6012f Completely reworks the plasma pistol, adds the dropwall shield generator (Serious) (#17556)
* oi you got a loicnse for that

* Final touches on plasma bar sound/sprite, hot drops hot drop walls

* Actually makes dropwalls good™️

* s p r i t e s and fixes

* Gives vox / drask hand gun sprites

* forgot cult shield, ICONS added with pain

* Last minute fixes and deploy coder sprites

* spacing

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Removes comments, improves deployment and sprite handling

* Removes direction_check

* Uses signals, various changes

* Final™️ changes

* Final™️ Final™️ Changes

* Final™️ Final™️ Final™️ Changes

* [insert final™️ x4 joke here]

* Final™️ Change. *6

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-04-30 15:52:25 +01:00
atteria
bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
Sirryan2002
6070a9222b Players can no longer exploit Meteorshot to throw anything that's not a turf (#17465)
* glorious fix

* moves check over to move_resist

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-03-08 11:39:17 +00:00
Dragonkiller93
d8fc832dbc Ammo boxes now return materials properly. (#17407)
* Initializes materials for ammo boxes correctly.

* Update code/modules/projectiles/ammunition.dm

Fixes spacing.

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Update code/modules/projectiles/ammunition.dm

Also fixes spacing.

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Removes unncessary variable (mats_initialized).

* Simplifies null check

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-03-08 11:34:36 +00:00
Mitchs98
21209687f4 removes finger gun force (#17456) 2022-03-08 11:22:17 +00:00
dearmochi
5693eb827e SSprojectiles - smoother and saner projectiles (#17127)
* SSprojectiles - smoother and saner projectiles

* trailing newline

* toki wo tomare

* Lower projectile speed back to 2x, reflector fix

* Tables stop projectiles properly
2022-02-25 18:30:05 +00:00
AffectedArc07
1c8a28425a Removes heist mode & associated code (#17256) 2022-01-11 11:36:57 +01:00