cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,300 Commits 26 Branches 2 Tags
8ef4aa727efb68cdbb4e6129bbbf71d96c5c489d
Commit Graph

6288 Commits

Author SHA1 Message Date
Charlie
8ef4aa727e Adds Shadow demons (#19732) 
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

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

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-29 11:26:37 -06: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
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897) 
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
 2022-12-27 11:00:39 -05:00
Bm0n
4bb0eb822d Ports TG ID cards (#19807) 
* new ids!

* tcomms fix for ERT

* as above

* star for ERT commander

* Syndie commander ID gets a star instead of crown

* fixed TDred ID card

* cmag tweak

* pda id overlay

* whoops i fucked up shaftminer

* first pass

* jobs_centcom

* SHHHHH

* WHY DO YOU HAVE GLOVES?
 2022-12-24 18:15:49 +01:00
Henri215
ab8217f012 Mineral doors now takes 2 seconds to build (#19992) 2022-12-24 11:05:24 -05:00
S34N
758a15010d duffels (#19984) 2022-12-22 19:55:28 +00:00
S34N
d55f6d10da Fixes a niche dufflebag issue (#19883) 
* fixes chat issues

* removal fixes

* this
 2022-12-19 14:32:49 +00:00
Daylight
ebf2d2b18f Creates full stacks of all sheets and minerals (#19911) 
* /fifty

* re-adds plastinium, even if the sheets themselves have no sprite

* adds glass stacks and plastitanium
 2022-12-19 14:29:55 +00:00
McRamon
0deaf46e1a Flags resprite (#19844) 
* first icons

* more icons

* fire

* solgov and ussp flag icons

* Hope i did it right

* fix

* Update flag.dm

* inhands_right

* inhands_left

* something

* aha

* missing_inhands

* Update code/modules/supply/supply_packs/pack_miscellaneous.dm

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

* Update flags_lefthand.dmi

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-13 16:47:16 +00:00
DevanStrife
3448b56a56 Anchorable Large Decor Statues (#19862) 
* Anchorable decor

* farie review
 2022-12-12 22:15:19 -05:00
Qwertytoforty
a3b4475c67 Prevents BOH storing backpacks / belts of holding, increased rnd level req (#19819) 2022-12-07 21:06:39 -05:00
SteelSlayer
1343a6358b mindslave implant runtime fix (#19792) 2022-12-07 21:05:00 -05:00
S34N
6d38a64ec7 Dufflebag rebalancing (#19744) 
* Adds duffel delay

* whitespace

* zip solution

* open bag on unzip

* zipping heck

* AltShiftClick
 2022-12-06 19:52:34 -06:00
Bm0n
c5b2b9c221 Ports TG cigarette boxes and fixes matchbox (#19810) 
* matchbox

* as above
 2022-12-06 00:29:06 -06:00
GDN
574bc6140b Adds a CMAG effect to the pizzabomb (#19766) 
* Adds a CMAG effect to the pizzabomb

* IT WAS A MISINPUT CALM THE FUCK DOWN
 2022-11-28 09:53:03 -05:00
Henri215
74a5925def A museum's finest: Statues tweaks (#19680) 
* tweaks and adds to statues

* bust removed
 2022-11-26 16:02:52 -05:00
Contrabang
72ee2f2488 fixes null belt icons (#19748) 2022-11-25 22:51:05 -06:00
Henri215
dfb85e6460 Preparing for the summer: baseball and dodgeballs! (#19627) 
* welcome to the space jam

* Apply suggestions from code review

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

* review suggestions

* conflict solve mistake

* Apply suggestions from code review

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

* Update code/game/objects/items/sport.dm

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

* Apply suggestions from code review

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

* wear suit check

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-25 22:50:17 -06:00
FloFluoro
e1d608f45b Drask can no longer eat soap for infinite nutrition (#19664) 
* Drask can no longer eat soap for infinite nutrition

* Added max_bites var

* Fix redundant return, syntax

* Splits soapeating behavior into own proc, design team requests

* overeat_limit is now a define

* Reduced weaken time, feedback

* Removed overeat penalty
 2022-11-24 23:17:58 +01:00
Coolrune206
c4a9044ad3 Fixes the syndie multitool tech origin, adds unit test for origin tech (#19729) 
* fixes the syndie multitool tech origin, I am god

* someone didn't know how origin_tech worked heh

* I dunno what this is but AA wanted it

* Revert "I dunno what this is but AA wanted it"

This reverts commit 073dc5b8b5.

* maybe this-a-work?

* Revert "maybe this-a-work?"

This reverts commit 6b9b4a43a1.

* Affected Arc, more like Affected Arc

* WILL, THIS, WORK?

* amogus

* I'm a genius

* Warriorstar request
 2022-11-24 22:47:24 +01:00
Henri215
9003a869f1 Restock unit tweaks (#19704) 
* Can use vending refill without having to unscrew

* weight size normal

* removing old comment that doent apply anymore

* Update code/game/machinery/vending.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-21 22:28:45 -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
Henri215
a7864e6e9a Clown FIX: Adds the clown recorder (#19710) 
* Adds the clown recorder

* added item action

* Defining cooldown

* cmag define

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

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

* added a second laugh

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-20 23:13:52 +01:00
Henri215
f4dec06e68 descs for pai and intellicard (#19707) 2022-11-18 18:13:45 -06:00
McRamon
765d966592 Secbelt and detective (#19666) 
* scanner added

* fixed comma
 2022-11-18 17:45:18 +00:00
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
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
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
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
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
Contrabang
32146754c1 bye bye macro (#19574) 2022-11-02 20:52:22 +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
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
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