cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,936 Commits 29 Branches 2 Tags
910d07561e942e5b3a32b5da4e37eb02224dbeb0
Commit Graph

1444 Commits

Author SHA1 Message Date
matttheficus
fc87927f7b Tool Size Tweaks (#20586) 
* The Great Toolening

* oops all belts (incoming self conflict lul)

* defines shouldnt lie

* mini crowbar TODOs

* beeeeeeeeeg crowbar

* oops it needs a design

* purple kit + vendor fix

* add mini crowbar dmi

* oops forgot this

* i am an idiot sandwhich

* im bad at code

* scratch that, i cant read my VSC

* wrench undo + readd to boxes

* nukies too

* man i cant code

* power tools should logically follow

* formatting

* maybe im free?

* forgot inhands

* Update toolbox.dm

* bluespace belt buff (unironic)

* undo for now

* fixes bluespace/tot belts + adds w_class override

* adds small crowbar to e-toolboxes and tot tools

* power tool fix

* Rnd build path

Co-authored-by: Adrer <erwin@lombok.demon.nl>

* design fix

* merge conflict + small fix

* small name fixes

---------

Co-authored-by: Adrer <erwin@lombok.demon.nl>
 2023-05-02 21:43:06 +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
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870) 
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
 2023-04-22 09:44:27 +02:00
GDN
c2176e3598 makes #20471 work (#20739) 2023-04-22 09:18:17 +02:00
GDN
1d6235afa7 adds the mecha ion thruster (#20728) 
* adds the mecha ion thruster

* Update code/game/mecha/equipment/tools/other_tools.dm

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

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

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

* devious

* ion thruster effect

* ryans review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-04-22 09:17:43 +02:00
Henri215
cb4a29037f Adds the trash bag of holding upgrade for janiborg (#20548) 2023-04-04 09:49:32 +01: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
Henri215
5c9d20f65f Ports the Bluespace Light Replacer from BeeStation (#20545) 
* Ports the Bluespace Light Replacer from BeeStation

* advanced replacer for janitor ERT

* wrong place

* Preventing it from being used over cameras

* Update code/game/objects/items/devices/lightreplacer.dm

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

* bluespace replacer only for gamma

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2023-03-22 22:22:19 -05: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
Ryan
feef0ea814 Fixes Garbage Collection issues with Xenobiology (#20190) 
* xenobio gc fixes

* requested changes

* requested changes
 2023-03-08 20:42:44 +01:00
1080pCat
6b4feef831 Removes the RCD from engi borgs base kit, and replaces it with a module upgrade (#20449) 
* be moved rcd!

* Minor grammar change ~contrabang

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* ert/emag borg get rcd & fixes issue GDN brought up

* Fixes an oversight with getting more than one rcd

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Remove space from rcd upgrade name

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-04 09:56:21 +01:00
S34N
9b260c4611 adds wire interface implant (#20482) 2023-03-04 09:56:06 +01: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
1080pCat
b8c12bbbf7 more medborg love (#20332) 2023-02-16 21:06:23 +01:00
Ryan
7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991) 
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

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

* Apply suggestions from code review

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

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-01-30 22:28:10 +00:00
Henri215
9a0ceb5a03 Janiborg no longer starts with floor buffer and now can be toggled (#20133) 
* Cyborg upgrade floor buffer and toggle mode

* Update code/game/objects/items/robot/robot_upgrades.dm

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

* Apply suggestions from code review

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-01-20 19:16:34 -05:00
Henri215
1c0d5fb551 Fix #20049 Upgraded protolathe no longer has issues with chemical costs (#20056) 2023-01-04 16:58:44 -05:00
Henri215
ad608cf016 Fix #20076 Plasmaglass and plasmarglass now returns the correct amount of materials (#20079) 
* Plasmaglass and Plasmarglass now returns the correct amount of materials

* forgot alien alloy
 2023-01-03 15:48:58 -05:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006) 
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
 2022-12-29 14:28:40 +00: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
a3b4475c67 Prevents BOH storing backpacks / belts of holding, increased rnd level req (#19819) 2022-12-07 21:06:39 -05:00
Henri215
7949596418 Make slot machines and bottlers with circuitboards (#19755) 2022-11-26 13:29:34 -05:00
Henri215
5e964fa9fc Video camera tweaks (#19481) 
* video camera tweaks and added to protolathe

* sprites

* you must wield it to use now

* Edan52 review and use of if(wielded)

* Back to one hand

* conflict

* sprites

* hahaha

* mistake fixed

* visible message, librarian camera and tweak to desc

* little tweak to desc

* Steelslayer review
 2022-11-26 12:10:15 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209) 
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

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

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

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

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

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

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-11-21 23:30:50 +00:00
S34N
b66fb2448c 515 compat 2, ./proc/ boogaloo (#19688) 
* 515 compat 2, ./proc/ boogaloo

* ASYNC

* further CI checks

* aa

* lol escape this / pls

* more of them

* no idea why but this is scuffed so
 2022-11-15 22:06:30 +01: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
S34N
0a441dc5d7 Revenant buff (#19577) 
* spooky

* not yet tested

* i hate my life

* CI

* Update code/datums/spell.dm

* Update code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

* review pass 1

* wise charlie words

* icons

* farie suggestion

* double vars

* haha oops

* bye you useless waste of space

* more damage

* farie review

* pass 2

* and this

* this is not a bool

* Apply suggestions from code review

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

* charlie review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-11-10 21:10:03 +01:00
S34N
667dd5d4ac 515 Compatibility (#19636) 
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
 2022-11-08 23:08:40 +00:00
FloFluoro
923e4b933a Adds new lawset, "Pranksimov" (#19306) 
* Adds new lawset, "Goofsimov"

* Goofsimov module now spawns at player's feet

* Module renamed to AsiFun

* Renamed... again!
 2022-11-05 13:44:41 +00:00
Coolrune206
e80ae1f95f Removes .357 Speed Loaders from Autolathe, replaces with .357 Ammo Boxes (#19553) 
* revolvers are balanced now, right?

* decreases metal cost per bullet from 5000 to 4000

* converts bullets to a new ammo box

* shut up Marmite (makes the revolver unrecyclable)
 2022-11-03 18:01:05 +00:00
Henri215
473a46ff5a Tweaks to autolathe design costs (#19469) 
* first wave of tweaks

* Update code/modules/power/cable.dm

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>

* Edan52 review

* missed one

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
 2022-10-28 20:05:46 +02:00
Vi3trice
03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388) 
* I wasn't done

* nits
 2022-10-28 19:28:23 +02:00
Henri215
47b3d08f04 Newscasters/camera monitors/displays tweaks (#19305) 
* frames and autolathe

* final adjustment

* engine monitor

* circuit board selection and newscaster tweaks

* names adjustments

* entertainment frame icon adjustment

* moving to another PR

* forgot to move those

* added the other monitors circuit boards

* Update code/game/machinery/computer/camera.dm

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

* removed unnecessary flow

* display

* entertainment frame uses correct icon now

* merge conflcit part 2, do_build for newscasters

* moving var

* Sirryan suggestion and reverting piece of code removed by mistake

* Update code/game/machinery/computer/buildandrepair.dm

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

* added description

* Apply suggestions from code review

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

* Sirryan suggestion and removed 1

* moved to on_deconstruction

* Removing unused arguments

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-10-28 19:00:03 +02:00
Deniz
a272267193 TGUI ORM MACHINE - Alloys Images (#19113) 
* ORM improved alloy name

* capital letter

* Add images to "Alloys" on ORM

* FML-main part done

* Few changes

* Recipe and Descriptions

* Forgot this. widens the ORM

* quick fix

* Slight alignment fix. New images on PR

* TGUI merge conflict and tiny alignment

* diff line endings!

* added ;

* Holes and stuff

* merge conflict fix, hopefully

* SMELT moved

* Alignment and tgui bundle

* Merge Conflict fix

* Update to master + tgui bundle

* TGUI Bundle

* TGUI BUNDLE

Co-authored-by: Henri23729 <iki-hs@hotmail.com>
 2022-10-25 23:48:53 +01:00
FloFluoro
a8a3694114 Sentience Potions now violently explode if overused (#19356) 
* Sentience Potions now violently explode if overused

* Early returns

* Removed redundant return, split cooldown behavior into two procs

* Removed redundant proc
 2022-10-21 20:40:10 +02:00
warriorstar-orion
69c46888da Don't track Runtime or Ian in E.X.P.E.R.I-MENTOR state. (#19430) 
* Don't track Runtime/Ian on E.X.P.E.R.I-MENTOR.

* snake case changed vars
 2022-10-21 20:02:57 +02:00
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
Farie82
a7179d97bf Makes wormhole projector portals spawn effects once every 0.5 seconds max (#19398) 
* Refactor the parameters and starting the teleport

* Adds arguments and moves the default effect generation up to do_teleport

* Typo in arguments

* portals now only create sparks every 0.5 second when things pass through

* Comment fix
 2022-10-15 11:40:32 +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
Vi3trice
43114ebd85 Admin Maximize Research applies to all tech types (#19320) 
* That's not used anymore

* Nevermind, it could possibly wind up getting used thanks to economy

* Update rdconsole.dm
 2022-10-12 12:45:24 +01: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
procdrone
dfad5f2004 Power controle module is dead. Long live APC electronics! (#19224) 
* apc board rename

* now apc electronics

* tool messages updated

* Apply suggestions from code review

suggestions applied

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-10-03 16:26:31 +01:00
Adri
4943029181 Removes red slime speed potion, replaces it with slime speed treat (#19194) 2022-10-01 15:50:43 +01:00
S34N
924e8cc949 Renames non-cybernetic implants to bio-chips (#18937) 
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

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

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-09-24 14:24:25 +01: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
Henri215
1c1f823bff ORM: Improved alloy naming (#19065) 
* ORM improved alloy name

* capital letter

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

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

* added spaces before (

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-09-16 18:06:19 -05:00
Octus
1c7882cb11 Ports the TG Dish Drive. A quality of life machine for service. (#18855) 
* ILOVEBARTENDING

* improvements

* oopsie daisy

* Apply suggestions from code review

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

* Update cable.dm

* fixes cable runtimes

* Apply suggestions from code review

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

* applies for code critique

* steelslayerreview

* Update code/game/machinery/constructable_frame.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-09-04 10:36:11 +01:00