cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 07:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #623 from ArchieBeepBoop/numbertwo

Browse Source 
Ports: GetComponent macros removal, and few other updates.
This commit is contained in:
Dahlular
2020-10-29 10:30:33 -06:00
committed by GitHub
parent 78e1327bca 2c7c66fc89
commit bbbd52a4a4
87 changed files with 248 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/gamemode/traitor_lewd.dm
+1 -1
View File
@@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(hyper_special_roles, list(
if(should_equip)
equip(silent)
for(var/obj/I in owner.current.GetAllContents())
GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, I)
var/datum/component/uplink/hidden_uplink = I.GetComponent(/datum/component/uplink)
if(hidden_uplink)
lewd_uplink_list = get_custom_uplink_items(lewd_uplink_list_raw, /datum/game_mode/traitor/lewd, TRUE, FALSE)
hidden_uplink.uplink_items = lewd_uplink_list
hyperstation/code/mobs/hugbot.dm
+1 -1
View File
@@ -123,7 +123,7 @@
if(ishuman(C))
var/mob/living/carbon/human/H = C
GET_COMPONENT_FROM(mood, /datum/component/mood, H)
var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
if(emagged != 2) // EVERYONE GETS HUGS!
for(var/datum/mood_event/i in mood.mood_events)
if (i.description == "<span class='nicegreen'>Hugs are nice.</span>\n" )