cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 01:26:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,288 Commits 17 Branches 2 Tags
8ce541adb1d68942da1cef678e4ae95bda8e72da
Commit Graph
1473 Commits
Author SHA1 Message Date
LucandGitHub b1565a36e9 Revert "Allows for the gravity generator to be cmagged. (#20944)" (#21493) 
This reverts commit 7115eca62e.
 2023-06-27 22:13:18 -05:00
LucandGitHub 7115eca62e Allows for the gravity generator to be cmagged. (#20944) 
* Add gravgen cmag interaction

* Bump cmag cooldown

* Add some checks for power state

* Sean review
 2023-06-22 20:53:23 +01:00
BurzahGitHubContrabang
 		f8fb66d84a [TGUI] Particle Accelerator (#21370) 
* TGUI Particle Accelerator - First Pass

* interface_control wire check

* Update tgui/packages/tgui/interfaces/ParticleAccelerator.js

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

* Apply suggestions from code review

Adding in the gray out for the buttons.

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

* formatting and margin fix

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-06-21 23:13:44 +01:00
QwertytofortyandGitHub 01b09bf3e8 You can no longer get the supermatter sliver objective if the station does not have a supermatter (#21337) 
* You can no longer get the supermatter sliver objective if the station does not have a supermatter

* sirryans changes
 2023-06-21 22:55:39 +01:00
GDNGitHubContrabangHenri215
 		b05e27bb17 Adds summon supermatter, a new wizard spell (#21096) 
* Devious intent

* bam

* also this

* Update code/game/gamemodes/wizard/spellbook.dm

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

* now a shard

* Update code/datums/spells/summon_supermatter.dm

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

* Update code/game/gamemodes/wizard/spellbook.dm

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

* improved code

* log name removal

* good enough

* conflict

* sprite by mcramon

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-06-15 19:16:47 +01:00
BurzahGitHubRyan
 		9d0fad1a41 TGUI - Turbine (#21226) 
* TGUI Turbine port

* Apply suggestions from code review

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

* TGUI data and operational change

* If check for compressor and turbine

* another if check

* tgui fix progress

* small adjustment to resolve

* oops... missing semicolons

* progress update, reconnect needs to be fixed

* small adjustment to const TurbineWorking

* Apply suggestions from code review

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

* adjustments to resolve conversations

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-06-14 21:14:08 +01:00
OctusandGitHub 98ddced488 Explorer Overhaul and Gateway Retirement (#20855) 
* Adds Explorer spawnability, removes Cyberaid gateways

* deletes some REALLY old bloat maps and deletes Gateway.dm

* Fixes runtime, and removes more stuff like gateway config... cause we dont have a gateway anymore

* removes all mention of /obj/machine/gateway

* Goodbye test_tiny and evil_santa 😈

* removed a literal fucking pamphlet

* changes map area name from Gateway to Expedetition

* changes the access from ACCESS_GATEWAY to ACCESS_EXPEDITION

* Revert "Goodbye test_tiny and evil_santa 😈"

This reverts commit eda775ecd5.

* ok deletes evil_santa only

* Fixes a runtime

* Adds new visuals for new area and explorer spawn marker

* Unhides explorers from the pref menu

* adds spawns and fixes the gateways for all maps, adds Expedition room to Cere

* improves and cleans up the expedition room maps, also clothes for Explorers

* GET OUT OF HERE EXAMPLE.

* byebye button
 2023-06-03 15:22:37 -05:00
DGamerLandGitHub 173bfb92f5 Removes bio resist from the code (#21108) 
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
 2023-06-03 09:50:22 +01:00
DGamerLandGitHub 810984f700 Fixes a few small spelling mistakes in the SM examine (#21198) 
* Spelling mistake is kill

* even more typos
 2023-06-02 20:01:50 -05:00
Vi3triceandGitHub 47f1cc87f6 Sets the SM layer to be above normal mobs (#21106) 
* If you're below the sm layer, you'll probably get dusted.

* Update supermatter.dm
 2023-06-02 19:56:53 +01:00
QwertytofortyGitHubLucRyanSteelSlayer
 		41a250c4a3 Ports TG supermatter effects / warp effect (#20808) 
* [WIP] Ports TG supermatter effects / warp effect

* remove this as it doesnt work

* also remove this test

* Now with real pulsing effects!

* smoother animation

* adds effect to gravity generator / bsg

* Apply suggestions from code review

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

* Move to effect, singularity has effect

* remove effect from size one singularites / narsi

* now works through walls, yipeee

* merge conflict return I did not want

* Apply suggestions from code review

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

* Bug fixes and visual tweaks

* Apply suggestions from code review

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

* Update plane_master.dm

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-06-01 14:29:00 -05:00
RyanGitHubHenri215ContrabangSteelSlayer
 		11717823df Power Code Cleanup + Conversion to Regional Powernets [Refactor Only] (#20598) 
* initial edits

* more cleanup, yipee

* moving shit around

* dme fixes

* fixes file ticking issue

* more dme fixes + duplicate files???

* Apply suggestions from code review

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

* glass floor fixes

* Apply suggestions from code review

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

* requested reviews

* the most painful bugfix of my life

* forgot to remove some debug stuff

* fixed issues with excess power

* fuck powernets (fix)

* Update code/modules/power/powernets/README.md

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-05-31 20:55:10 -05:00
LucandGitHub d8ddda378b Deadchat Plays SS13: Ghost Control of Mobs (#20600) 
* Add dchat control

* adds human support, cleans other things up

* Bit of cleanup

* actually use the item

* minor proc ref mistake, laugh at this user

* evil tg strings

* Renames defines, adds vv menu item for it

* Improve anarchy message formatting

* don't go to_chatting tesla energy balls

* aa review

* Minor cleanups, replace some emotes

* Addressing some reviews

* Incorporate some checks for deadchat mutes/prefs
 2023-05-21 12:33:11 -05:00
LucGitHubRyan
 		b2fa6060f6 Adds ghost notification when the singularity is (likely) loose. (#20826) 
* let you know when it's (probably) loose

* better checks

* guh

* bwaaah

* Update code/modules/power/singularity/singularity.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-22 09:29:32 +02:00
1080pCatGitHubRyan
 		d315a74ca5 Adds a funny little message if you focus too hard on a singulo/teslo (#20815) 
* tele thingy

* grammar!

* new singulo message

* clasuse guarded (and more grammar)

* grammar, indentations, removes a useless return

* Update code/modules/power/singularity/singularity.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-22 09:29:02 +02:00
ppi13GitHubLuc
 		bcbce645b1 Allows human mobs to alt+click to unlock APC and Air Alarms (#20742) 
* alt+click to unlock airalarms and apc

* Update code/modules/atmospherics/machinery/airalarm.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-04-22 09:18:31 +02:00
Coolrune206andGitHub 7293b7ecbd Allows admins to freeze the SM (#20616) 
* allows admins to freeze the SM

* Hal9000 Review

* now works better than deleting frozen mobs!
 2023-04-13 16:37:18 +02:00
unknownuser782andGitHub f28f14d90b Distinguish between plating turf layer and floor turf layer. (#20503) 
* move plating layer

* atmos correctness pass

* transparent floor ordering and wire terminal stuff

* fix control flow spacing
 2023-03-26 12:25:08 +01:00
LucGitHubContrabang
 		6bf5172bec Fix SM (and some other) follow links (#20554) 
* hoopefully fix SM message tracking being really weird

* update some more follow targets

* Apply suggestions from code review

hehe

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

* Cleans up some loose ends, implements for arrivals announcer too

* Changes target to the new deactivated core

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-03-26 12:17:37 +01:00
GDNGitHubAdriSteelSlayer
 		5557f6ae32 Nukes detailed examine (#20314) 
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

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

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

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

* Update code/modules/power/apc/apc.dm

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

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

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

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-03-17 16:20:53 -05:00
GDNandGitHub 71de6caeed fixes borgs not being able to use APCs (#20611) 
* fixes borgs not being able to use APCs

* also this
 2023-03-12 14:55:54 -06:00
GDNGitHubS34N
 		d0898bb256 makes APCs gc and fixes an APC destroy issue (#20478) 
* makes APCs gc and fixes an APC destroy issue

* Update code/modules/power/apc/apc.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-08 07:00:20 +00:00
GDNGitHubHenri215S34N
 		c294037c74 fixes ais being able to control apcs with ai control off and borgs runtiming when attempting to do so (#20443) 
* fixes ais being able to control apcs with ai control off and borgs runtiming when attempting to do so

* Update code/modules/power/apc/apc.dm

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

* Update code/modules/power/apc/apc.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-07 22:23:55 -06:00
GDNandGitHub 201bb2bb3b fixes overhealing exploit (#20489) 2023-02-24 18:14:05 -06:00
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
 		5098d1db5e Gravity generator icon properly reflects its state on roundstart. (#20412) 
* Gravity generator updates icon on initialize

* Use set_power instead of update icon

* Fixes Restore Power Routine

* Revert "Fixes Restore Power Routine"

This reverts commit 5e17dc33f2.

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2023-02-21 21:04:55 +00:00
S34NandGitHub ece09782ec emergency lights now turn off after 2 minutes, not 10 (#20228) 2023-02-14 20:31:00 +01:00
AffectedArc07andGitHub b34e8fa301 [READY] CI now bans files with the same name (#20195) 
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
 2023-02-04 16:33:41 -06:00
CharlieandGitHub c5d7250c66 Projectiles now orbit blackholes (#19999) 
* orbit

* I HATE ANGLES I HATE ANGLES I HATE ANGLES

* PERFORMANCE

* ready to merge
 2023-02-03 22:36:06 -06:00
RyanGitHubHenri215
 		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
LucandGitHub 9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184) 
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
 2023-01-20 19:28:48 -05:00
QwertytofortyandGitHub cc1de516ad Emagging a pacman does something once again. (#20179) 
* I hate tgui

* sirryan changes

* tgui.png
 2023-01-18 22:37:16 -05:00
GDNandGitHub 860b2e5334 fixes a nar-sie runtime (#20203) 2023-01-15 18:04:39 -05:00
QwertytofortyandGitHub 33d937feb8 Removes the part of apc losing malf points on apc deconstruction I missed (#20091) 2023-01-06 22:11:50 +01:00
QwertytofortyandGitHub 61eefd625e Gravity generator is now more radioactive to people when turning on or off (#20001) 2023-01-06 21:56:58 +01:00
CharlieGitHubSirryan2002
 		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
AffectedArc07andGitHub 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-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Vi3triceandGitHub 752c54ca0c Solar panels got their own little office chairs (#19898) 2022-12-13 14:05:05 -06:00
QwertytofortyGitHubSirryan2002SteelSlayer
 		ff737eff7e Vetus balance tweaks, also with a grav anomaly tweak (#19799) 
* Anomaly and some vetus balance tweaks

* whoops

* Update code/game/objects/effects/anomalies.dm

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

* Update code/game/objects/effects/anomalies.dm

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

* early return

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-12-04 19:16:01 -06:00
ContrabangandGitHub 57af3821fa Fixes APCs being immune from explosion and tesla destruction (#19742) 
* apc-fixes

* sirryan review
 2022-11-26 00:09:42 -06:00
S34NandGitHub 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
S34NandGitHub 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
Henri215GitHubEdan
 		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
Vi3triceandGitHub 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
S34NGitHubFarie82
 		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
Vi3triceandGitHub 59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
Shadow-QuillGitHubContrabangLucCharlie
 		3958de2de4 Adds some examine helpers (#18997) 
* Adds some examine helpers

* Includes suggestions

* Macroifies some "the"s

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

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

* Apply suggestions from code review

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

* Update code/game/objects/items/devices/radio/intercom.dm

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-10-11 08:11:23 +01:00
Vi3triceandGitHub 20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
ContrabangandGitHub 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
procdroneGitHubAffectedArc07
 		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