cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Completely Purges Any Suggestion That The IAA is a Lawyer. (#25371)

Browse Source 
* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* The IAA is not a lawyer. They were never a lawyer. Glory to INGSO- uhh, NANOTRASEN!

* There was lawyer stuff on the maps.

* crush

* Update code/modules/pda/pdas.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update pda.dmi

* Update code/modules/clothing/under/accessories/accessory.dm

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Fordoxia <fordoxia@googlemail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-06-12 17:55:45 +00:00
committed by GitHub
co-authored by Contrabang Fordoxia Luc
parent f879418cf1
commit 90c7d9bb93
38 changed files with 152 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/datacore.dm
+1 -1
View File
@@ -417,7 +417,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
if("Shaft Miner")
clothes_s = new /icon('icons/mob/clothing/under/cargo.dmi', "explorer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY)
if("Lawyer")
if("Internal Affairs Agent")
clothes_s = new /icon('icons/mob/clothing/under/civilian.dmi', "internalaffairs_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if("Chaplain")
code/datums/spells/cluwne.dm
+2 -2
View File
@@ -54,7 +54,7 @@
SetConfused(0)
SetJitter(0)
if(mind)
mind.assigned_role = "Lawyer"
mind.assigned_role = "Internal Affairs Agent"
var/obj/item/organ/internal/honktumor/cursed/tumor = get_int_organ(/obj/item/organ/internal/honktumor/cursed)
if(tumor)
@@ -85,5 +85,5 @@
unEquip(gloves, 1)
qdel(G)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/lawyer/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE)
code/datums/station_traits/positive_traits.dm
+1 -1
View File
@@ -184,7 +184,7 @@
/datum/job/hop = /obj/item/organ/internal/eyes/cybernetic/shield,
/datum/job/hos = /obj/item/organ/internal/cyberimp/brain/anti_stam, //not giving them thermals
/datum/job/janitor = /obj/item/organ/internal/cyberimp/eyes/hud/jani,
/datum/job/lawyer = /obj/item/organ/internal/heart/cybernetic/upgraded,
/datum/job/iaa = /obj/item/organ/internal/heart/cybernetic/upgraded,
/datum/job/mime = /obj/item/organ/internal/cyberimp/brain/anti_stam, //...
/datum/job/paramedic = /obj/item/organ/internal/cyberimp/mouth/breathing_tube,
/datum/job/psychiatrist = /obj/item/organ/internal/heart/cybernetic/upgraded, //heart of gold. Or at least part gold