cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into map-development

Browse Source 
# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
This commit is contained in:
skull132
2017-05-01 01:07:56 +03:00
parent c03666340a c197ce34fc
commit a5848c2802
336 changed files with 4668 additions and 3389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/reagent_containers/dropper.dm
View File

@@ -61,7 +61,7 @@
var/contained = reagentlist()
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]</font>")
msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(M))
return
else

31
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
View File

@@ -179,6 +179,15 @@
..()
reagents.add_reagent("gin", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/victorygin
name = "Victory gin"
desc = "Pour one out for Al'mari. His gun was on stun, bless his heart."
icon_state = "victorygin"
center_of_mass = list("x"=16, "y"=4)
New()
..()
reagents.add_reagent("victorygin", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
@@ -499,3 +508,25 @@
New()
..()
reagents.add_reagent("sbiten", 100)
// Butanol-based alcoholic drinks
//=====================================
//These are mainly for unathi, and have very little (but still some) effect on other species
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/xuizijuice
name = "Xuizi Juice"
desc = "Blended flower buds from the Xuizi cactus. It smells faintly of vanilla. Bottled by the Arizi Guild for over 200 years."
icon_state = "xuizibottle"
center_of_mass = list("x"=16, "y"=10)
New()
..()
reagents.add_reagent("xuizijuice", 30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/sarezhiwine
name = "Sarezhi Wine"
desc = "A premium Moghean wine made from Sareszhi berries. Bottled by the Arizi Guild for over 200 years."
icon_state = "sarezhibottle"
New()
..()
reagents.add_reagent("sarezhiwine", 100)

36
code/modules/reagents/reagent_containers/food/lunch.dm
View File

@@ -1,11 +1,11 @@
var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/snacks/sandwich,
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice,
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice,
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice,
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice,
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice,
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice,
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice,
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry,
@@ -29,17 +29,17 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac
/obj/item/weapon/reagent_containers/food/snacks/cherrypie,
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit,
/obj/item/weapon/reagent_containers/food/snacks/appletart,
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice,
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice,
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice,
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice,
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice,
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice,
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice,
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice,
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice,
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice,
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice/filled,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks,
/obj/item/weapon/reagent_containers/food/snacks/friedkois,
/obj/item/weapon/reagent_containers/food/snacks/meatsnack,

2231
code/modules/reagents/reagent_containers/food/snacks.dm
View File

File diff suppressed because it is too large Load Diff

4
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -47,7 +47,7 @@
var/contained = reagentlist()
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [name] by [key_name(user)] Reagents: [contained]</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [name] to [key_name(M)] Reagents: [contained]</font>")
msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(M))
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
@@ -67,7 +67,7 @@
user << "<span class='notice'>You dissolve \the [src] in [target].</span>"
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Spiked \a [target] with a pill. Reagents: [reagentlist()]</font>")
msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(target))
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))

6
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -62,13 +62,13 @@
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].",ckey=key_name(user))
if(reagents.has_reagent("pacid"))
message_admins("[key_name_admin(user)] fired Polyacid from \a [src].")
log_game("[key_name(user)] fired Polyacid from \a [src].")
log_game("[key_name(user)] fired Polyacid from \a [src].",ckey=key_name(user))
if(reagents.has_reagent("lube"))
message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
log_game("[key_name(user)] fired Space lube from \a [src].")
log_game("[key_name(user)] fired Space lube from \a [src].",ckey=key_name(user))
return
/obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)

2
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -256,7 +256,7 @@
user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM).</font>"
target.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM).</font>"
msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(src))
return