cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 17:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

49 Commits

Author SHA1 Message Date
S34N
17a68e9242 Revert "[FIX] Jobbaned Roles at poll_candidates" (#23927) 2024-01-26 20:12:20 +01:00
PhantornRU
867da454c6 Jobbaned Roles at poll_candidates (#23847) 2024-01-25 11:41:35 -06:00
DGamerL
382a71df0d Renames all typepaths + names of implants to biochips (#23172) 
* The fix

* Contraaaaaa

* Fixes CI

* Fixes the pads + cases

* Uplink datums

* Update code/datums/mind.dm

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

* Update code/__HELPERS/unsorted.dm

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

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

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

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

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

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

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

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

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

* Update code/modules/surgery/implant_removal.dm

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

* Outfits now use a proper variable name

* Fixes surgery (oops)

* More .dme changes

* Renames the folder

* Fixes bad merge

* Contra review

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

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

* Fixes CI fail

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-06 23:15:55 +00:00
Qwertytoforty
b678d0289d Kidan, drask, and greys can be ERT now (#23552) 2023-12-26 13:27:16 -05:00
Luc
9384c2a074 Allows roundstart observers to freely use antag HUD without losing respawnability (#23009) 
* First pass

* do away with old antag hud variable

* rework cannotPossess

* some verification + cleanups

* Update code/modules/mob/dead/observer/observer_base.dm

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

* splits up log call

* Slightly refactor proc calls, continuing contra's review

* Log admin

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-11-21 13:00:13 +00:00
GDN
6df2c2e3d2 Ghost bar (#22368) 
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

* Update code/modules/admin/verbs/debug.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

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

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

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

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

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-09 19:47:17 +01:00
Contrabang
fa52e8540e Adds more features to the ERT manager (#22070) 
* BOOM UPGRADED

* self-review

* remove todo

* build tgui

* bam

* Update code/modules/response_team/ert.dm

Co-authored-by: Henri215 <77684085+Henri215@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-09-09 13:42:39 +01:00
GDN
02b5773a72 makes ghosts that sign up for an ert gc (#22065) 2023-08-25 16:52:46 +01:00
GDN
73269c0527 forcemodule fix (#21009) 2023-05-11 11:50:59 -05:00
Coolrune206
2478724a09 tourte is knocking on my window requesting stuff (#20693) 2023-04-22 09:17:17 +02:00
Qwertytoforty
b90bb7bcb8 ERT / nukies can now choose any NON KARMA species (#20032) 
* ERT / nukies can now chose any NON KARMA species

* hahah yeah better fix that from testing

* warning people about implant destruction

* spritare

* random species option

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@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>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-01-20 19:22:29 -05:00
warriorstar-orion
77f576a5ca Recategorize in-game announcements by priority. (#19639) 2022-12-19 17:02:22 +00: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
warriorstar-orion
12c873d816 Fix human appearance randomness in spawners. (#19561) 2022-11-03 17:59:30 +00:00
S34N
5f58a80d8a Let admins allow ERT borgs to choose sec modules (#17874) 
* Let admins allow secborgs in ERT

* dont force them to be secborgs

* fixes up some logic

* remove this

* Update code/modules/tgui/modules/ert_manager.dm

* le indent

* deconflict

* tgui deconflict

* Update code/modules/tgui/modules/ert_manager.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-06-25 00:07:18 +01:00
Farie82
8001f1ec04 Refactors the mind.original variable into non reference variables. Improving player mob GC (#17219) 2021-12-16 18:30:21 +01:00
AffectedArc07
c7fd6681a1 Gamemode configuration 2021-05-16 15:15:05 +01:00
ppi13
9a582679f1 Gives ERT Combat Gloves (#15879) 
* Gives ERT Combat Gloves

* Removes pasta
 2021-04-20 21:50:17 +01:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
dearmochi
14e9e92508 Sets ERT's offstation_role to TRUE (#15282) 2021-01-20 09:59:54 +00:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07
2e29a1ddcb Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190 2020-09-15 20:46:10 +01:00
Kyep
28d915b26f fixes merge conflict 2020-09-15 08:40:03 -07:00
Kyep
0bf5d71ddf defaults 2020-08-29 21:05:50 -07:00
Kyep
e71f40f3c0 [TGUI] ERT Manager 2020-08-29 17:34:01 -07:00
Kyep
6927ad1b31 Port Radios to TGUI 2020-08-09 12:36:30 -07:00
mochi
977a022d40 Convert remaining pollCandidates, remove original proc 2020-07-10 11:07:11 +02:00
Kyep
547d76fb4b Cyborg Improvements (#13056) 
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-06-28 14:16:14 -06:00
AffectedArc07
928a8f0e04 Makes the code pass dreamchecker (#13161) 
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
 2020-04-11 15:59:16 -06:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152) 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
 2020-03-20 21:56:37 -06:00
variableundefined
5daf9a190b Merge pull request #11712 from Markolie/lazy 
Custom outfit manager and spawn with outfit on transform/reincarnate
 2019-08-24 12:27:48 -04:00
tayyyyyyy
0f9feead4e Randomized ERT priority 2019-07-08 15:01:13 -07:00
tayyyyyyy
f0d9aaeb0a Increase role ranking time to 20 seconds 2019-07-08 15:00:29 -07:00
Mark van Alphen
8234881a2a New custom outfit managers, select equipment refactor and spawn with outfit on transform/reincarnate 2019-06-09 21:46:41 +02:00
variableundefined
19c8a8265e Merge pull request #11486 from Tayyyyyyy/better_ert_spawn 
Non-blocking ERT selection/spawn
 2019-05-17 23:07:30 +08:00
tayyyyyyy
665659bd88 Asynchronously spawn ERT 2019-05-09 11:52:28 -07:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Kyep
1b9fe80d4f Fixes/refactors unspawnable ERT alert 2019-04-22 07:03:55 -07:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
datlo
aeb1ed6007 make new proc that actually works 2019-01-11 20:55:12 +00:00
datlo
645e242ea6 Fix disability removing on ERT/Nuke ops/ayy 2019-01-11 19:20:46 +00:00
Kyep
b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
Kyep
f901cf3893 ERTs now count as 'good' aligned chaplains for nullrod purposes 2018-11-24 19:53:34 -08:00
Kyep
b139af2bdd v1 2018-11-23 20:08:49 -08:00
joep van der velden
202ba8b5ed Forgot ERT, moved the boxes to boxes.dm 2018-11-10 12:08:06 +01:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Birdtalon
deec79982e adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 sprite, adds paranormal armour variants. 2018-09-28 19:22:55 +01:00
Birdtalon
424f3ac200 changes to ERT equipment datums, organises some files a little clearer 2018-09-22 14:00:41 +01:00