cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 05:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins

Browse Source 
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
This commit is contained in:
Anewbe
2017-01-17 22:05:38 -06:00
parent 2c86a0a465 b0faa7c06c
commit d53cfc4773
137 changed files with 2730 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/datums/EPv2.dm
View File

@@ -112,23 +112,27 @@ var/global/list/all_exonet_connections = list()
return null
// Proc: send_message()
// Parameters: 3 (target_address - the desired address to send the message to, message - the message to send, text - the message text if message is of type "text")
// Description: Sends the message to target_address, by calling receive_message() on the desired datum.
/datum/exonet_protocol/proc/send_message(var/target_address, var/message, var/text)
// Parameters: 3 (target_address - the desired address to send the message to, data_type - text stating what the content is meant to be used for,
// content - the actual 'message' being sent to the address)
// Description: Sends the message to target_address, by calling receive_message() on the desired datum. Returns true if the message is recieved.
/datum/exonet_protocol/proc/send_message(var/target_address, var/data_type, var/content)
if(!address)
return 0
return FALSE
var/obj/machinery/exonet_node/node = get_exonet_node()
if(!node) // Telecomms went boom, ion storm, etc.
return FALSE
for(var/datum/exonet_protocol/exonet in all_exonet_connections)
if(exonet.address == target_address)
exonet.receive_message(holder, address, message, text)
break
node.write_log(src.address, target_address, data_type, content)
return exonet.receive_message(holder, address, data_type, content)
// Proc: receive_message()
// Parameters: 4 (origin_atom - the origin datum's holder, origin_address - the address the message originated from, message - the message that was sent,
// text - the message text if message is of type "text")
// Parameters: 4 (origin_atom - the origin datum's holder, origin_address - the address the message originated from,
// data_type - text stating what the content is meant to be used for, content - the actual 'message' being sent from origin_atom)
// Description: Called when send_message() successfully reaches the intended datum. By default, calls receive_exonet_message() on the holder atom.
/datum/exonet_protocol/proc/receive_message(var/atom/origin_atom, var/origin_address, var/message, var/text)
holder.receive_exonet_message(origin_atom, origin_address, message, text)
return
/datum/exonet_protocol/proc/receive_message(var/atom/origin_atom, var/origin_address, var/data_type, var/content)
holder.receive_exonet_message(origin_atom, origin_address, data_type, content)
return TRUE // for send_message()
// Proc: receive_exonet_message()
// Parameters: 3 (origin_atom - the origin datum's holder, origin_address - the address the message originated from, message - the message that was sent)

5
code/datums/underwear/bottom.dm
View File

@@ -62,4 +62,9 @@
/datum/category_item/underwear/bottom/striped_panties
name = "Striped Panties"
icon_state = "striped_panties"
has_color = TRUE
/datum/category_item/underwear/bottom/longjon
name = "Long John Bottoms"
icon_state = "ljonb"
has_color = TRUE

27
code/datums/underwear/undershirts.dm
View File

@@ -51,6 +51,18 @@
name = "Tank top, fire, feminine"
icon_state = "tank_fire_fem_s"
/datum/category_item/underwear/undershirt/tank_top_rainbow
name = "Tank top, rainbow"
icon_state = "tank_rainbow_s"
/datum/category_item/underwear/undershirt/tank_top_stripes
name = "Tank top, striped"
icon_state = "tank_stripes_s"
/datum/category_item/underwear/undershirt/tank_top_sun
name = "Tank top, sun"
icon_state = "tank_sun_s"
/datum/category_item/underwear/undershirt/shirt_heart
name = "Shirt, heart"
icon_state = "lover_s"
@@ -125,4 +137,17 @@
/datum/category_item/underwear/undershirt/bowlingw
name = "Bowling Shirt, White"
icon_state = "bowlingw"
icon_state = "bowlingw"
/datum/category_item/underwear/undershirt/longjon
name = "Long John Shirt"
icon_state = "ljont"
has_color = TRUE
/datum/category_item/underwear/undershirt/longstripe_black
name = "Longsleeve Striped Shirt, Black"
icon_state = "longstripe"
/datum/category_item/underwear/undershirt/longstripe_blue
name = "Longsleeve Striped Shirt, Blue"
icon_state = "longstripe_blue"