cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 14:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,096 Commits 27 Branches 2 Tags
cbdbf60f5768fbb1e05f6b6e6bf0b60a0c603dba
Commit Graph

9864 Commits

Author SHA1 Message Date
Coolrune206
cbdbf60f57 Makes the pet collar not an accessory. Remake remake of the revert of the revert. (#19644) 
* let's try this again

* who even named these variables

* Sirryan review

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

* removes as mob

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-11-17 17:31:51 +00:00
S34N
7dcd31990e Ports TCC style windows (#19488) 
* window

* fix plasma window and spawners

* this now works well

* Apply suggestions from code review

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

* Empty-Commit

* Empty-Commit

* colour tweaks

* further colour tweaks

* last tweak

* edges

* false wall sanity

* Update code/__DEFINES/icon_smoothing.dm

* stealth conflict begone

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
 2022-11-16 20:44:51 +00:00
FloFluoro
4477cc7438 Rainbow/Mime crayons can no longer be used for infinite nutrition (#19668) 2022-11-16 20:41:40 +01:00
S34N
be91fdc0b8 Wizard den remap (#19575) 
* wiz den refresh

* brass and wood

* final tweaks

* wrong door

* mira
 2022-11-15 18:59:10 -06:00
Christasmurf
9a1b71493a garment bags (#19654) 2022-11-15 17:47:28 -06:00
S34N
4de47b8b58 Refactors table creation (#19441) 
* refactors table creation

* probably works will test later

* tested and tweaked

* words are hard

* Apply suggestions from code review

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

* steel review

* proc breakout

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-15 15:45:55 -06: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
Henri215
fc57d9fc61 Another buff to radio jammers (#19696) 
* jammer buff part 2

* 75 --> 70
 2022-11-15 19:44:46 +00:00
FloFluoro
47c944a1f5 Gives puddle a unique description (#19702) 2022-11-15 19:44:54 +01:00
Coolrune206
67add93f82 fixes cable cuffs changing secbelt color (#19656) 2022-11-14 22:56:56 +01:00
BiancaWilkson
46f43c5fe7 True! (#19660) 2022-11-12 09:01:37 +01:00
Charlie
421777b317 Reworks block chance into Parrying. (#19334) 
* parry component

* converts block chance to parry components

* armour pen, katana fix, pickup fix

* melee parry fix

* removes perfect parries, tweaks armour pen calc

* SIGNAL_HANDLER

* fix

* resist fix

* reduces parry time out time, increases cooldown

* Apply suggestions from code review

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

* fix

* cooldown rebalance

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-11-12 08:49:44 +01:00
Xsingular
28d5379f08 NTTC now uses rank for formatting if the job title is non-standard (#19623) 
* NTTC now uses rank for formatting

NTTC now checks rank as well as job title on the ID when it decides how to format a message.

This allows Acting Heads to keep their departmental color.

* NTTC now uses rank for formatting if the job title is non-standard

Removes unnecessary value assignments

* Removed extra space

whoopsie daisy, a bit too generous there...

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2022-11-11 14:48:01 +01:00
Henri215
eea6b82b15 Sarcophagus now can be made using sandstone (#19625) 
* added sarcophagus to sandstone recipes

* 5 seconds to build
 2022-11-11 14:31:58 +01:00
Henri215
fbbb147872 proto cost tweaks (#19596) 2022-11-11 14:17:44 +01:00
BiancaWilkson
aa7fd4eaf8 BEGONE (#19560) 2022-11-11 14:13:56 +01:00
GDN
fde612de05 Initializes and fixes alien eggs (#19604) 
* Initializes and fixes alien eggs

FIX: Fixes alien eggs not spawning facehuggers when a valid target is in range
FIX: Fixes alien eggs runtiming due to proximity monitor issues
REFACTOR: Refactors Spawn() into addtimer
REFACTOR: New() to initialize()

* standardization and removing unneeded checks

* 515 compliance

* just need PROC_REF for this
 2022-11-10 17:05:22 -06: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
332fc9193a Fixes description grammar in a few places (#19607) 
* Fixes punctuation on clown box description

* Fixes grammar in a couple places
 2022-11-06 10:43:20 +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
S34N
8e475415b1 Stops tree shadows from being part of their hitbox (#19543) 
* unclickable shadows

* readability

* effect

* Update code/game/objects/structures/flora.dm

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

* order of operations

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-03 18:02:08 +00:00
Christasmurf
66e893ad2d Adds Suspicious Bomber Jacket (#19545) 
* syndicatebomber

* armourmeup

* Update code/modules/clothing/suits/miscellaneous.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-03 18:01:31 +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
047727d575 safe no longer locked when repaired (#19569) 2022-11-03 17:58:05 +00:00
Contrabang
32146754c1 bye bye macro (#19574) 2022-11-02 20:52:22 +00:00
Bm0n
c4ded4b083 Ports TG direction signs (#19506) 
* signs

* whoops forgot the desc

* evacfix
 2022-11-02 21:03:05 +01:00
matttheficus
09948d54b2 Deputizing the Detective (#19558) 
* Deputizing the Detective

* access giveth

* the gun now hurts you again

as per Hal's comment in discord

* add noir to detdrobe
 2022-10-31 23:15:12 +00:00
Vi3trice
05d93f665a [TM] Port TG Jump Point Search and SSpathfinder (#18984) 
* move along move along

* Update bot.dm

* Diagonals are now more expensive

* Update path.dm

* Update parrot.dm

* Update path.dm

* Tweaks

* Fix cleanbot, add path safety

* Tweaked, added a safety, removed the previous one

* Update medbot.dm

* path.len isn't very safe as a whole, floorbots also had order of operations wrong

* Update medbot.dm

* clings not even once

* Back to the drawing board

* Update path.dm

* Make mules actually clear the drawn path.

* Make bots use step_towards unconditionally instead of flipping between step_to and Move

* Making extra sure the path is cleared. Somehow path was left over.

* Check for length as get_path_to is always true

* This and that
 2022-10-30 15:54:51 +00:00
Farie82
d253e13c35 Add a comment for item_state (#19534) 2022-10-30 15:52:21 +00:00
ElorgRHG
c456bdefdc [GBP NO UPDATE] Fixes the basetype of .../under/suit spawning (#19471) 
* Fixes the basetype of .../under/suit spawning

* Suggestion

* The other way around
 2022-10-28 20:20:01 +02: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
Henri215
0a3111f6cf Matter wont consume if theres a wall already (#19518) 2022-10-28 20:04:26 +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
GDN
9400729a28 Removes some technical debt (#19220) 2022-10-28 19:09:21 +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
Contrabang
8b3c043746 cloth addition (#19480) 2022-10-26 00:25:11 +01:00
AzuleUtama
c8edc8c240 Syndi Bundle Rework (#19352) 
* Syndi Bundle Rework

* Revised bundles based on feedback

* Reworked operative into grenadier

* Corrected payday value
 2022-10-26 00:19:56 +01:00
Vi3trice
fc7e4847b3 Penlights are universally pens (#19498) 
* You're a pen, you're a light

* Update code/__DEFINES/is_helpers.dm

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

* Might as well remove them

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-10-26 00:12:14 +01:00
Henri215
499a0f3b9d Moved wood floor (#19487) 2022-10-25 20:35:28 +02:00
Contrabang
a6ba421e21 removes implantchair.dm (#19460) 2022-10-23 16:39:45 -05:00
ElorgRHG
574b012505 The (formal CC) blueshield drip is back in town (#19425) 2022-10-23 11:34:45 -05:00
roarbark
71bd40099c buffs the radio jammer (#19377) 
* buffs the radio jammer

come on and jam and welcome to the jam

* come on and jam

the jam

* i never actually watched space jam i just thi

running outta jokes

* unjams the pr

im so fucking funny bro

* unfucks the pr for real (developers swearing bot hello)

worth a try
 2022-10-23 11:20:20 -05:00
BiancaWilkson
21fc24a31c Ports Yogstation's version of CQC, adds it back to traitor uplink. (#19310) 
* Changes most instances of brute to stamina, combos

* Adds CQC back into uplink

* Updates chokeholds so it takes time to knock out

* Adds cqc back to tot uplink, gives nukies discount

* Tweaks base grabs and disarms

* Tweaks combos some

* I am a mild idiot

* Charlie's suggestions

* I don't like these numbers, nerf head kick

* Removes blocking and countering

* More kicking tweaks

* Update code/datums/uplink_item.dm

commit charlie's changes pt. 2

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

* stop kicking yourself

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-10-22 21:42:17 +01:00
ElorgRHG
1660182d19 Paradise's soul removal part three: lawyers (#19376) 
* Better Call Coderspriters

* This name looks better

* Turns out this is not a copy of an existing jumpsuit

* Minor drask sprite adjustment
 2022-10-21 20:36:36 +02:00
S34N
ce7d68fcf1 Fixes draggable bushes, sprite oversight [MAPPING CHANGES] (#19351) 
* no drag the bush, and other tweaks

* im smart

* mapping changes

* delete
 2022-10-19 16:22:41 -05:00
S34N
96b39e6a28 Removes USSP gateway, adds nothing (#19373) 
* removes ruskie gateway

* mira

* space ruin

* oops make it a proper template

* y e e t
 2022-10-19 21:13:30 +01:00
Farie82
8386e9cdef Fixes waterpacks and friends not GCing (#19269) 
Move nozzles to Initialize
Makes reagents not hold a reference to their atom when they get destroyed
 2022-10-18 22:52:35 -05:00
DevanStrife
bb2e2a9d45 Allows wooden airlocks to be made and removes another text2path function. (#19199) 
* Fixes #18882 and refactors for door assemblies

* Removes text2path, makes wooden airlocks buildable

* Use mineral crafting menu

* Minor oversight

* Comments improvement

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

* Review suggestions

* Removes unneeded vars

* Fixed tab spacing

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-10-16 13:04:50 -05:00
Henri215
d9903511e8 Adds the chameleon counterfeiter (#19335) 
* added cham counterfeit main code

* overlays and uplink

* icon

* small message fix

* adjustments

* updated cost

* Apply suggestions from code review

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

* remvoved duplicated and added suggestion

* description

* adjustment

* moved to new file

* moved to new file and farie suggestion

* added examine override

* removed unnecessary stuff

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

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

* removed unnecessary stuff

* Update code/datums/uplink_item.dm

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

* lewcc suggestions

* moved playsound to before if

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-10-16 16:43:50 +01:00
GDN
f4a55d844b Grenade GC improvement (#19355) 
* Grenade GC improvement

* Adds commits

* farie's suggestion

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-10-16 16:22:27 +02:00