cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 10 Branches 2 Tags
dev-docs-readme
Commit Graph

65 Commits

Author SHA1 Message Date
DGamerL 7199e80bd9 Aaaaa how did I not notice this before (#26835) 2024-09-19 13:10:47 +00:00
DGamerL e3c73110db Adds Chemical flamethrowers (#25091) 
* Initial work

* Good enough to open a PR out of draft

* Make these use the vars on the flamethrower

* Moar fixes

* Undefines define

* Update code/game/objects/items/weapons/chemical_flamethrower.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* This won't compile

* GDN review

* Fixes CI

* Fixes CI even more

* 5 ammo per tile now

* Heavily nerfs adding multiple fires

* Adds phlogiston as a burnable reagent

* Fixes the fire name

* Placeholder sprite + ammo use fix

* Now in cargo partially

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Lewc Review

* Adds nuclear variant

* Adds the chem flamethrower to the nukie uplink, alongside ammo

* More fire armor tweaks

* GDN review

* Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* TEMPORARY PUSH

* Adds inhands

* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Fixes inhands

* Makes air hot again

* Lewc review

* Audible messages and canister refilling

* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-05 23:12:56 +00:00
matttheficus 03659c270e warcrimes are now illegal (#25490) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-05-28 13:22:20 +00:00
Qwertytoforty a50683ef28 Adds the SPRK-12 Energy Pistol (#24869) 
* Adds the SPRK-12 Pistol

* I Was improper and forgot to name it right

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* check it

* Update gun.dm

* less copypasta

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* early return

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2024-04-28 22:03:14 +00:00
GDN 9e6dcf9c46 removes the remaining datum redeclares (#25220) 
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
 2024-04-21 18:26:35 +00:00
PopeDaveThe3th a2a8293e8c Updates names and descriptions of common ballistics (#24416) 
* Updates names and descriptions of common ballistics

* updates WT550 crates, magazines, and ammo boxes

* Update launchers.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update automatic.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:16:42 +00:00
DGamerL 31822a1831 Adds the Strong-Arm empowered musculature implant (#22159) 
* Aaaaaaaaaaaa

* IT WORKS

* Okay now make it a martial art

* Final shit

* Forgor this

* Protolathe moment

* The sprite

* Typo fixes

* Burza review

* Contra review

* Contra review

* Contra + Henri review

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Me when I push untested code

* Contra review pt 1

* Contra review

* I forgor

* I forgot v2

* Henri review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-09-07 11:00:45 +01:00
Samman166 49b26c4eba WT Rework and Nerf (#20536) 
* Reworks and nerfs WTs

* Removes some duplicate comments

* Makes WT ammo box's normal sized items because I forgot to at first

* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once

* Sanity checks work properly now

* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt

* Update code/__HELPERS/mob_helpers.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/__HELPERS/mob_helpers.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Magazines fit in security webbings

* I forgot a comma

* Apply suggestions from code review

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

* Applying various reviewer suggestions

* Applies various suggestions

* removes moving_do_after now that its a param

* Apply suggestions from code review

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

* solves the merge conflict hopefully

* step one of trying to fix conflict again

* step two hopefully fixes conflict

* Delete ammo.dmi

* Merge branch 'master' into wt-rework

* Apply suggestions from code review

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

* Applying various reviewer suggestions

* Revert "Applying various reviewer suggestions"

This reverts commit 7081e9aa2b.

* Revert "Apply suggestions from code review"

This reverts commit 96dab4f8b8.

* Revert "Merge branch 'master' into wt-rework"

This reverts commit 6906a67654.

* Merge branch 'master' into wt-rework

* please god work

* Update code/modules/projectiles/ammunition.dm

* Update code/modules/projectiles/ammunition/magazines.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-05-25 18:41:56 +02:00
Qwertytoforty 2517851800 Nerfs laser rifle ammo size and emp proofness. (#21082) 
* Nerfs IK ammo size and emp proofness.

* description / emp

* Update code/modules/research/designs/weapon_designs.dm

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

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

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-22 22:25:03 +02:00
Qwertytoforty d5567103fd Reworks the lwap to make it better. (#20884) 
* Boss you killed a child... AMAZING MISSION COMPL-

* small patch fix other stuff later

* More fixes to clicking on the dot

* lwap scopes better / decativates on movement

* Apply suggestions from code review

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

* requested changes

* lower speed by marms suggestion

* scope keeps creeping

* Apply suggestions from code review

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

* henks changes

* define

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-05-02 21:28:34 +02:00
Coolrune206 d559f2ce89 Adds the Security Laser Rifle (#20602) 
* security laser rifle

* RnD magazines, yum

* "Hey Drake, where's the req_tech?"

* increases ammo count to 20. flattens magazines.

* RIP small magazines

* fixes it being unprintable, oopsies

* caseless laser rounds
 2023-03-26 11:43:19 +01:00
Qwertytoforty 5197d1b62a Completely reworks the tesla revolver (need to work on damage values) (#20295) 
* part one: the rest of a fucking owl

* kit

* shocking changes

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

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

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

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

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

* Update energy_projectiles.dm

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-03-17 10:26:02 -05:00
Coolrune206 f90418d715 Re-adds the LWAP, reworked (#20401) 
* re-adds the lwap

* no dual wielding snipers

* Lewcc review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Hal9000 request

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-02-25 21:19:03 -06:00
Qwertytoforty f86374a504 Adds the vortex feedback inversion arm. (#19821) 
* start of mess

* reflect/parries works

* more pog-ress

* temp icons, .33 to 0.4

* more work, sound, rnd, fixes me breaking shields

* removes this since open pr fixes

* better codee

* attack log

* Final changes / sprites by ramon

* fixes issue

* shoot ramon for the white pixel :^)

* But what if it was a purple glass shard

* Fixes the throw parry

* sorry for so many commits, lower callback

* Apply suggestions from code review

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

* Early return, no need to typecast

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-27 10:45:59 -05:00
Qwertytoforty 4b18a002ab makes dropwall grenades actually a reasonable price (#19619) 2022-11-11 14:21:34 +01:00
Henri215 fbbb147872 proto cost tweaks (#19596) 2022-11-11 14:17:44 +01: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
Qwertytoforty d530aeba33 Energy crossbow gunkits now need a laser gun (#19087) 
* Lockboxes energy crossbow gunkits

* converts to requiring a laser gun
 2022-09-18 22:02:09 +01:00
Qwertytoforty f9defc92bf Adds Fusion Gauntlets to RND (#18804) 
* do a once over first

* merge conflict shit

* armor pen to modern stuff

* Apply suggestions from code review

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

* BOY SMELL THEM MERGE CONFLICTS

* icons / final changes

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-09-17 10:45:58 +01:00
KalevTait 9850d3d840 research (#18300) 2022-07-10 14:02:05 +01:00
Viz 77767b8986 Untases your slug (#18185) 2022-07-03 22:12:44 +01:00
Bm0n d43eb77b25 Replaces Free Guns From Sci With Parts Kits (#17918) 
* rip sci powergamers

* grammar

* apparently i don't know how to spell

* code review

* +to

* oook

* a over the
 2022-06-26 18:53:03 +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
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
Qwertytoforty c65a472888 Adds the BSG to RND designs (#16328) 
* Adds the BSG to RND designs

* Update code/modules/research/designs/weapon_designs.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-07-26 18:12:37 +01:00
Qwertytoforty 2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343) 
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-03-30 11:55:31 +01:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud 0b32cba04d bluespace in R&D 2018-04-22 07:24:17 -04:00
Fox McCloud 4306d27521 circuit imprinter update 2018-04-22 00:34:06 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown 369c654c70 moves material defines to construction.dm 
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
 2018-02-06 01:24:36 +05:00
Squirgenheimer 66b7b26b21 Fixes typo for energy crossbow 2017-10-25 10:10:43 -04:00
Fox-McCloud b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Fox-McCloud 182dcd93b5 autolathe receivers 2017-03-24 16:57:25 -04:00
davipatury cffe34e3f9 Description fix. 2017-02-15 20:04:26 -02:00
davipatury 63a690ca79 Urnaium. 2017-02-15 20:00:12 -02:00
monster860 a31c87e2e0 Makes RnD console use NanoUI 2016-06-08 21:14:14 -04:00
TheDZD 9a4c1125e0 Merge pull request #4343 from Fox-McCloud/accelerator-cannon 
Ports Accelerator Laser Cannon
 2016-05-05 21:22:08 -04:00
Fox-McCloud 2328ff2be5 Tesla Gun Implementation and Small R&D Change 2016-05-04 17:13:28 -04:00
Fox-McCloud c3c3ad2602 Ports Accelerator Laser Cannon 2016-05-02 23:50:38 -04:00
Crazylemon64 bd2b5f11b6 Makes the decloner possible to create again 2016-03-10 23:27:50 -08:00
Fox-McCloud 3ac2f23377 Heavily Rebalances Science 2016-03-09 02:58:05 -05:00
Regen 2db5fec54a Adds immolator laser gun 
Adds an immolator laser gun, which has 7 shots and ignites the target.
http://puu.sh/nfys1/b381d812de.png

Will add more and better pictures tomorrow, but right now I need sleeps
 2016-02-21 03:26:44 +01:00
Fox-McCloud eade350dc8 Sec Rifle Port 2016-01-02 01:06:37 -05:00
Fox-McCloud 2481a8d7bd Research Lockbox Access Change and Wormhole Projector Lockboxing 2015-12-22 11:42:09 -05:00
Fox-McCloud ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Markolie ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Fox-McCloud a35a8cef1b Protolathe Fix 2015-09-17 03:43:36 -04:00
Mark van Alphen cbb2a16409 Merge pull request #2046 from Fox-McCloud/tech-shell-balance 
Tech Shells: Silver Removal
 2015-09-15 17:36:57 +02:00