cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge tgstation13 r4570 into bs12_with_tgport

Browse Source 
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-28 19:57:11 +10:00
parent f1ddffcfb4 b0f750339c
commit eacd84b212
269 changed files with 14389 additions and 13349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+12 -15
View File
@@ -3102,7 +3102,7 @@ datum
brave_bull
name = "Brave Bull"
id = "bravebull"
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
description = "It's just as effective as Dutch-Courage!."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
@@ -3140,7 +3140,7 @@ datum
toxins_special
name = "Toxins Special"
id = "toxinsspecial"
description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!"
description = "This thing is ON FIRE!. CALL THE DAMN SHUTTLE!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
@@ -3390,7 +3390,7 @@ datum
whiskeysoda
name = "Whiskey Soda"
id = "whiskeysoda"
description = "Ultimate refreshment."
description = "For the more refined griffon."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
@@ -3525,7 +3525,7 @@ datum
bahama_mama
name = "Bahama mama"
id = "bahama_mama"
description = "Tropic cocktail."
description = "Tropical cocktail."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
@@ -3731,7 +3731,7 @@ datum
alliescocktail
name = "Allies Cocktail"
id = "alliescocktail"
description = "A drink made from your allies."
description = "A drink made from your allies, not as sweet as when made from your enemies."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
@@ -3790,7 +3790,7 @@ datum
acid_spit
name = "Acid Spit"
id = "acidspit"
description = "A drink by Nanotrasen. Made from live aliens."
description = "A drink for the daring, can be deadly if incorrectly prepared!"
reagent_state = LIQUID
color = "#365000" // rgb: 54, 80, 0
@@ -3809,12 +3809,12 @@ datum
amasec
name = "Amasec"
id = "amasec"
description = "Official drink of the Imperium."
description = "Official drink of the Nanotrasen Gun-Club!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
on_mob_life(var/mob/living/M as mob)
M.stunned = 4
M.stunned = 1
if(!data) data = 1
data++
M.dizziness +=4
@@ -3835,10 +3835,7 @@ datum
on_mob_life(var/mob/living/carbon/M as mob)
if(!M) M = holder.my_atom
M.adjustOxyLoss(0.5)
M.adjustOxyLoss(0.5)
M.weakened = max(M.weakened, 15)
M.silent = max(M.silent, 15)
M.weakened = max(M.weakened, 3)
if(!data) data = 1
data++
M.dizziness +=6
@@ -3857,7 +3854,7 @@ datum
hippies_delight
name = "Hippie's Delight"
id = "hippiesdelight"
description = "A drink enjoyed by people during the 1960's."
description = "You just don't get it maaaan."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
@@ -3948,7 +3945,7 @@ datum
changelingsting
name = "Changeling Sting"
id = "changelingsting"
description = "A stingy drink."
description = "You take a tiny sip and feel a burning sensation..."
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
@@ -3986,7 +3983,7 @@ datum
syndicatebomb
name = "Syndicate Bomb"
id = "syndicatebomb"
description = "A Syndicate bomb"
description = "Tastes like terrorism!"
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
code/modules/reagents/grenade_launcher.dm
+1 -1
View File
@@ -61,6 +61,6 @@
log_game("[key_name_admin(user)] used a grenade ([src.name]).")
F.active = 1
F.icon_state = initial(icon_state) + "_active"
playsound(user.loc, 'armbomb.ogg', 75, 1, -3)
playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
spawn(15)
F.prime()
code/modules/reagents/reagent_containers/borghydro.dm
+1 -1
View File
@@ -61,7 +61,7 @@
return
/obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob)
playsound(src.loc, 'pop.ogg', 50, 0) //Change the mode
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) //Change the mode
if(mode == 1)
mode = 2
charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes.
code/modules/reagents/reagent_containers/food/condiment.dm
+2 -2
View File
@@ -33,7 +33,7 @@
spawn(5)
reagents.trans_to(M, 10)
playsound(M.loc,'drink.ogg', rand(10,50), 1)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
else if( istype(M, /mob/living/carbon/human) )
@@ -54,7 +54,7 @@
spawn(5)
reagents.trans_to(M, 10)
playsound(M.loc,'drink.ogg', rand(10,50), 1)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
return 0
code/modules/reagents/reagent_containers/food/drinks.dm
+2 -2
View File
@@ -33,7 +33,7 @@
spawn(5)
reagents.trans_to(M, gulp_size)
playsound(M.loc,'drink.ogg', rand(10,50), 1)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
else if( istype(M, /mob/living/carbon/human) )
@@ -61,7 +61,7 @@
spawn(600)
R.add_reagent(refill, fillevel)
playsound(M.loc,'drink.ogg', rand(10,50), 1)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
return 0
code/modules/reagents/reagent_containers/food/snacks.dm
+1 -1
View File
@@ -75,7 +75,7 @@
return
if(reagents) //Handle ingestion of the reagent.
playsound(M.loc,'eatfood.ogg', rand(10,50), 1)
playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
code/modules/reagents/reagent_containers/food/snacks/grown.dm
+14 -12
View File
@@ -146,7 +146,9 @@
W:amount -= 5
if(!W:amount) del(W)
user << "<span class='notice'>You add some cable to the potato and slide it inside the battery encasing.</span>"
new /obj/item/weapon/cell/potato(user.loc)
var/obj/item/weapon/cell/potato/pocell = new /obj/item/weapon/cell/potato(user.loc)
pocell.maxcharge = src.potency * 10
pocell.charge = pocell.maxcharge
del(src)
return
@@ -214,16 +216,16 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/Del()
if(istype(loc,/mob))
loc.sd_SetLuminosity(loc.luminosity - potency/5)
loc.SetLuminosity(round(loc.luminosity - potency/5,1))
..()
/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/pickup(mob/user)
src.sd_SetLuminosity(0)
user.total_luminosity += potency/5
src.SetLuminosity(0)
user.SetLuminosity(round(user.luminosity + (potency/5),1))
/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/dropped(mob/user)
user.total_luminosity -= potency/5
src.sd_SetLuminosity(potency/5)
user.SetLuminosity(round(user.luminosity - (potency/5),1))
src.SetLuminosity(round(potency/5,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
seed = "/obj/item/seeds/cocoapodseed"
@@ -769,7 +771,7 @@
if(istype(src.loc,/mob))
pickup(src.loc)
else
src.sd_SetLuminosity(potency/10)
src.SetLuminosity(round(potency/10,1))
lifespan = 120 //ten times that is the delay
endurance = 30
maturation = 15
@@ -793,16 +795,16 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Del()
if(istype(loc,/mob))
loc.sd_SetLuminosity(loc.luminosity - potency/10)
loc.SetLuminosity(round(loc.luminosity - potency/10,1))
..()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
src.sd_SetLuminosity(0)
user.total_luminosity += potency/10
SetLuminosity(0)
user.SetLuminosity(round(user.luminosity + (potency/10),1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
user.total_luminosity -= potency/10
src.sd_SetLuminosity(potency/10)
user.SetLuminosity(round(user.luminosity + (potency/10),1))
SetLuminosity(round(potency/10,1))
// *************************************
// Complex Grown Object Defines -
code/modules/reagents/reagent_containers/spray.dm
+2 -2
View File
@@ -58,7 +58,7 @@
sleep(3)
del(D)
playsound(src.loc, 'spray2.ogg', 50, 1, -6)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from a spray bottle.")
@@ -181,7 +181,7 @@
sleep(2)
del(D)
playsound(src.loc, 'spray2.ogg', 50, 1, -6)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from a chem sprayer.")
code/modules/reagents/syringe_gun.dm
+1 -1
View File
@@ -56,7 +56,7 @@
del(S)
D.icon_state = "syringeproj"
D.name = "syringe"
playsound(user.loc, 'syringeproj.ogg', 50, 1)
playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
for(var/i=0, i<6, i++)
if(!D) break