cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 16:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,489 Commits 29 Branches 2 Tags
5ccd8241c45e7a1d97eea0c234ba1b94de3bf173
Commit Graph

1498 Commits

Author SHA1 Message Date
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
S34N
d445cbc4de Fixes burst weapons not properly having weapon spread when dual wielded (#17149) 2021-11-24 09:53:14 +01:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
joep van der velden
39a280effd Shooting fuel tanks now is logged properly 
objects that get qdeleted are only hit once by bullets
 2021-11-10 10:23:47 +01:00
SabreML
1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906) 
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
 2021-11-04 19:47:31 +01:00
Vi3trice
a3d515ce4e Makes the telegun a wee bit more sensible 2021-10-23 12:25:11 -04:00
variableundefined
56003f88ac Merge pull request #16884 from Qwertytoforty/A-simple-mob-problem 
Adds a malf AI upgrade for engineering borgs, adds zipties to all emaged borgs.
 2021-10-17 13:44:09 -05:00
Qwertytoforty
f9c4cff64c And a description change 2021-10-04 22:13:59 -04:00
Qwertytoforty
f45cdbf047 Cyborg variant, sprites 2021-10-04 20:36:41 -04:00
Qwertytoforty
d9135ece44 Adds 90% of the stuff 2021-10-04 17:26:13 -04:00
Qwertytoforty
957edb4420 Fixes being able to install 0 cost upgrades on an energy crossbow (#16861) 
* Fixes being able to install 0 cost upgrades on an energy crossbow

* Just uses max_mod_capacity

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

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-04 20:26:57 +01:00
Fox McCloud
ca6f253aa6 Merge pull request #16449 from AffectedArc07/client-data-loading 
Refactors client data loading
 2021-09-20 15:16:55 -04:00
AffectedArc07
2c5276dbb9 Fox tweaks 2021-09-20 19:14:04 +01:00
variableundefined
5339cdf212 Merge pull request #16659 from Fox-McCloud/the-end-of-lethal-shot 
Nerfs Shotguns
 2021-09-19 11:25:02 -05:00
hal9000PR
bf04ec4b34 fix 2021-09-18 23:44:10 +01:00
hal9000PR
3c52cea099 fix (#16728) 2021-09-18 15:36:35 +01:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
roarbark
8156f4b13a code looks uniform now. praying to god that people dont get emails for this. 2021-09-18 02:01:33 +02:00
roarbark
9a290b4e7a whoops, the 9mm armourpiercing is now back to 10 AP 2021-09-18 01:51:06 +02:00
roarbark
69fd8f9b9a Revert "Revert "new subtype, changed values"" 
This reverts commit bf150bdfac.
 2021-09-18 01:46:57 +02:00
roarbark
bf150bdfac Revert "new subtype, changed values" 
This reverts commit ae99d900e7.
 2021-09-18 01:25:39 +02:00
roarbark
ae99d900e7 new subtype, changed values 2021-09-18 01:17:58 +02:00
roarbark
0774ec2867 buffs wt550 ap 
this increases the armour piercing ammo that the autorifle gets from 10 ap to 30 ap
 2021-09-12 23:56:51 +02:00
variableundefined
6c085cf23b Merge pull request #16064 from michaelyesok/foampistol 
Foam enforcer tweaks
 2021-09-11 19:12:07 -05:00
variableundefined
7cffabf93c Merge pull request #16422 from Qwertytoforty/too-hot-to-handle 
Immolator lasers now immolate all mobs
 2021-09-11 13:22:02 -05:00
variableundefined
d5639d1e7b Merge pull request #16674 from S34NW/fence-railings 
Adds railings and fences
 2021-09-11 13:11:42 -05:00
S34NW
adc250cdc5 we don't need these with the istype checks 2021-09-10 22:11:03 +01:00
S34NW
0c4dcd1b62 projectiles can pass 2021-09-10 19:07:02 +01:00
variableundefined
baa59c4042 Merge pull request #16654 from farie82/add_attack_log-ssd-tweak 
Attack logs on SSD targets now only get the FEW loglevel if there is a user doing it
 2021-09-09 17:14:59 -05:00
Fox McCloud
a081051133 Nerfs Shotguns 2021-09-08 12:17:08 -04:00
joep van der velden
4b22aa12da add_attack_logs ssd tweak 
only overrides the log_level if the target is SSD AND there is a user
 2021-09-07 21:04:29 +02:00
SteelSlayer
3cc83e6011 wand of slipping fixes 2021-09-06 12:23:27 -05:00
AffectedArc07
70fd70f2eb Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-09-02 14:01:27 +01:00
variableundefined
936fbf3194 Merge pull request #16601 from Qwertytoforty/wii-sports-annoucer 
Adds antimatter sniper rounds, buffs bleeding rounds, nerfs base sniper rounds
 2021-09-01 19:46:04 -05:00
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00