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

Tweaks and Fixes and Major Map Changed

Browse Source 
More Info will be posted directly, later.
This commit is contained in:
Fox-McCloud
2014-10-13 22:00:07 -04:00
parent 441dd3ecb5
commit 8c1f6431e6
21 changed files with 11898 additions and 11852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/tgevents/anomaly_bluespace.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/event/anomaly/anomaly_bluespace
startWhen = 3
announceWhen = 10
endWhen = 55
endWhen = 160
/datum/event/anomaly/anomaly_bluespace/announce()
code/modules/events/tgevents/anomaly_flux.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/datum/event/anomaly/anomaly_flux
startWhen = 3
announceWhen = 20
endWhen = 60
endWhen = 180
/datum/event/anomaly/anomaly_flux/announce()
code/modules/events/tgevents/anomaly_grav.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/datum/event/anomaly/anomaly_grav
startWhen = 3
announceWhen = 20
endWhen = 50
endWhen = 70
/datum/event/anomaly/anomaly_grav/announce()
code/modules/events/tgevents/anomaly_vortex.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/event/anomaly/anomaly_vortex
startWhen = 10
startWhen = 20
announceWhen = 3
endWhen = 80
code/modules/mob/living/carbon/human/emote.dm
+17
View File
@@ -527,6 +527,23 @@
else
message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps \himself. Shameful."
if("slap")
m_type = 1
if (!src.restrained())
var/M = null
if (param)
for (var/mob/A in view(1, null))
if (param == A.name)
M = A
break
if (M)
message = "\red <B>[src]</B> slaps [M] across the face. Ouch!"
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
else
message = "\red <B>[src]</B> slaps \himself!"
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
src.adjustFireLoss(4)
if ("scream")
if (miming)
message = "<B>[src]</B> acts out a scream!"
code/modules/mob/living/carbon/human/life.dm
+4 -2
View File
@@ -242,11 +242,13 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(3)
emote("drool")
/*
if(species.name == "Tajaran")
if(prob(1))
if(prob(1))
vomit(1) // Hairball
*/
if(stat != 2)
var/rn = rand(0, 200)
@@ -290,8 +292,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(!gene.block)
continue
if(gene.is_active(src))
if (prob(10) && prob(gene.instability))
adjustCloneLoss(1)
/* if (prob(10) && prob(gene.instability))
adjustCloneLoss(1) */
gene.OnMobLife(src)
if (radiation)
code/modules/mob/transform_procs.dm
+2 -2
View File
@@ -457,10 +457,10 @@
return 1
//Antag Creatures!
if(ispath(MP, /mob/living/simple_animal/hostile/carp))
/* if(ispath(MP, /mob/living/simple_animal/hostile/carp))
return 1
if(ispath(MP, /mob/living/simple_animal/hostile/giant_spider))
return 1
return 1 */
if(ispath(MP, /mob/living/simple_animal/borer))
return 1
if(ispath(MP, /mob/living/carbon/alien))
code/modules/paperwork/pen.dm
+16 -2
View File
@@ -106,7 +106,21 @@
var/datum/reagents/R = new/datum/reagents(50)
reagents = R
R.my_atom = src
R.add_reagent("zombiepowder", 10)
R.add_reagent("cryptobiolin", 15)
R.add_reagent("stoxin", 30)
R.add_reagent("mutetoxin", 15)
..()
return
/obj/item/weapon/pen/paralysis/attackby(var/obj/item/O as obj, var/mob/user as mob) //courtesy of FalseIncarnate!
if (O.is_open_container())
//Check if container is of the "glass" subtype (includes buckets, beakers, vials)
if(istype(O, /obj/item/weapon/reagent_containers/glass))
var/obj/item/weapon/reagent_containers/glass/C = O
//Check if container is empty
if(!C.reagents.total_volume)
user << "\red [C] is empty."
return
//Container not empty, transfer contents to tray
var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this)
user << "\blue You transfer [trans] units of the solution to [src]."
code/modules/projectiles/guns/energy/laser.dm
+3 -3
View File
@@ -70,11 +70,11 @@ obj/item/weapon/gun/energy/laser/retro
name = "laser cannon"
desc = "With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!"
icon_state = "lasercannon"
// fire_sound = 'sound/weapons/lasercannonfire.ogg'
fire_sound = 'sound/weapons/lasercannonfire.ogg'
origin_tech = "combat=4;materials=3;powerstorage=3"
projectile_type = "/obj/item/projectile/beam/heavylaser"
charge_cost = 500 // Half the cost of the regular laser, weaker projectile.
fire_delay = 3
charge_cost = 1250
fire_delay = 10
isHandgun()
return 0
code/modules/projectiles/projectile/beams.dm
+2 -2
View File
@@ -304,11 +304,11 @@ var/list/beam_master = list()
flag = "laser"
eyeblur = 2
//changing heavy lasers to shoot twice as fast as regular lasers, and do a bit more DPS.
//Heavy lasers now deal slightly more damage, but have a slower firing rate; overall DPS still identical to lasers.
/obj/item/projectile/beam/heavylaser
name = "heavy laser"
icon_state = "heavylaser"
damage = 25
damage = 50
/obj/item/projectile/beam/xray
name = "xray beam"
code/modules/reagents/Chemistry-Machinery.dm
+3 -3
View File
@@ -246,7 +246,7 @@
ui_title = "Soda Dispens-o-matic"
energy = 100
max_energy = 100
dispensable_reagents = list("water","ice","coffee","tea","icetea","cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice","limejuice","tomatojuice" ,"watermelonjuice","berryjuice")
dispensable_reagents = list("water","ice", "milk", "soymilk", "coffee","tea","hot_coco", "cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice", "lemonjuice", "limejuice","tomatojuice", "banana", "watermelonjuice", "carrotjuice", "potato", "berryjuice")
hack_message = "You change the mode from 'McNano' to 'Pizza King'."
unhack_message = "You change the mode from 'Pizza King' to 'McNano'."
hacked_reagents = list("thirteenloko")
@@ -258,10 +258,10 @@
energy = 100
max_energy = 100
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
dispensable_reagents = list("ice","cream","beer","kahlua","whiskey","wine","vodka","gin","rum","tequila","vermouth","cognac","ale","mead")
dispensable_reagents = list("ice","cream","beer","kahlua","whiskey","wine","vodka","gin","rum","tequilla","vermouth","cognac","ale","mead")
hack_message = "You disable the 'nanotrasen-are-cheap-bastards' lock, enabling hidden and very expensive boozes."
unhack_message = "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes."
hacked_reagents = list("goldschlager","patron", "nothing")
hacked_reagents = list("goldschlager","patron", "absinthe", "ethanol", "nothing")
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+12
View File
@@ -116,6 +116,10 @@
icon_state = "chocolateglass"
name = "Glass of chocolate"
desc = "Tasty"
if("hot_coco")
icon_state = "hot_coco"
name = "Glass of hot coco"
desc = "Delicious and cozy"
if("lemonjuice")
icon_state = "lemonglass"
name = "Glass of lemonjuice"
@@ -192,6 +196,10 @@
icon_state = "rumglass"
name = "Glass of Rum"
desc = "Now you want to Pray for a pirate suit, don't you?"
if("absinthe")
icon_state = "absinthebottle"
name = "Glass of Absinthe"
desc = "The green fairy is going to get you now!"
if("gintonic")
icon_state = "gintonicglass"
name = "Gin and Tonic"
@@ -356,6 +364,10 @@
icon_state = "carrotjuice"
name = "Glass of carrot juice"
desc = "It is just like a carrot but without crunching."
if("potato")
icon_state = "glass_brown"
name = "Glass of potato juice"
desc = "Who in the hell requests this? Gross!"
if("banana")
icon_state = "banana"
name = "Glass of banana juice"
code/modules/virus2/effect.dm
+3 -2
View File
@@ -369,7 +369,8 @@
*/
/datum/disease2/effect/orbweapon
/*
/datum/disease2/effect/orbweapon //peopel are just griefing the shit out of each other with this..and with a constantly regenerating weapon that has a throwforce of 30? I can see why.
name = "Biolobulin Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
@@ -388,7 +389,7 @@
if (slot == slot_l_hand)
canremove = 1 //curses!
..()
*/
/datum/disease2/effect/plasma
name = "Toxin Sublimation"