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

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/life.dm
This commit is contained in:
cib
2012-08-06 15:18:27 -07:00
parent 5b342bd217 0021fe1f49
commit cc2aaf1731
174 changed files with 15211 additions and 13805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/closets/secure/security.dm
+2
View File
@@ -52,6 +52,8 @@
new /obj/item/weapon/storage/id_kit(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/device/flash(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/glasses/sunglasses(src)
return
code/game/objects/closets/wardrobe.dm
+6 -5
View File
@@ -46,10 +46,9 @@ obj/structure/closet/wardrobe/hos/New()
obj/structure/closet/wardrobe/hop/New()
new /obj/item/clothing/under/rank/head_of_personnel(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/weapon/clipboard(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/gloves/blue(src)
new /obj/item/clothing/head/helmet(src)
/obj/structure/closet/wardrobe/pink/New()
new /obj/item/clothing/under/color/pink(src)
@@ -116,6 +115,8 @@ obj/structure/closet/wardrobe/hop/New()
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/magboots(src) //[Redacted] ZAS! >:C
new /obj/item/clothing/head/helmet/hardhat/red(src)
/obj/structure/closet/wardrobe/engineering_yellow/New()
new /obj/item/clothing/under/rank/engineer(src)
@@ -356,6 +357,6 @@ obj/structure/closet/wardrobe/hop/New()
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/brown(src)
code/game/objects/contraband.dm
+9 -6
View File
@@ -13,7 +13,7 @@
/obj/item/weapon/contraband/poster
name = "rolled-up poster"
desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as Contraband aboard Nanotrasen© Space Facilities."
desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as Contraband aboard NanoTrasen© Space Facilities."
icon_state = "rolled_poster"
var/serial_number = 0
var/obj/effect/decal/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
@@ -118,22 +118,22 @@ obj/effect/decal/poster/New(var/serial)
desc += " This particular one is of a couple of ragged gunmen, one male and one female, on top of a mound of rubble. The number \"13\" is visible on their blue jumpsuits."
if(8)
name += " - Pinup Girl Cindy"
desc += " This particular one is of Nanotrasen's PR girl, Cindy, in a particularly feminine pose."
desc += " This particular one is of NanoTrasen's PR girl, Cindy, in a particularly feminine pose."
if(9)
name += " - Pinup Girl Amy"
desc += " This particular one is of Amy, the nymphomaniac Urban Legend of Nanotrasen Space Stations. How this photograph came to be is not known."
desc += " This particular one is of Amy, the nymphomaniac Urban Legend of NanoTrasen Space Stations. How this photograph came to be is not known."
if(10)
name += " - Don't Panic"
desc += " This particular one depicts some sort of star in a grimace. The \"Don't Panic\" is written in big, friendly letters."
if(11)
name += " - Underwater Laboratory"
desc += " This particular one is of the fabled last crew of Nanotrasen's previous project before going big on Asteroid mining, Sealab."
desc += " This particular one is of the fabled last crew of NanoTrasen's previous project before going big on Asteroid mining, Sealab."
if(12)
name += " - Missing Gloves"
desc += " This particular one is about the uproar that followed Nanotrasen's financial cuts towards insulated-glove purchases."
desc += " This particular one is about the uproar that followed NanoTrasen's financial cuts towards insulated-glove purchases."
if(13)
name += " - Rogue AI"
desc += " This particular one depicts the shell of the infamous AI that catastropically comandeered one of Nanotrasen's earliest space stations. Back then, the corporation was just known as TriOptimum."
desc += " This particular one depicts the shell of the infamous AI that catastropically comandeered one of NanoTrasen's earliest space stations. Back then, the corporation was just known as TriOptimum."
if(14)
name += " - User of the Arcane Arts"
desc += " This particular one depicts a wizard, casting a spell. You can't really make out if it's an actial photograph or a computer-generated image."
@@ -242,6 +242,9 @@ obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
user << "<span class='notice'>You start placing the poster on the wall...</span>" //Looks like it's uncluttered enough. Place the poster.
//declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster
if(P.resulting_poster.serial_number != P.serial_number)
del P.resulting_poster
P.resulting_poster = new /obj/effect/decal/poster(P, P.serial_number)
var/obj/effect/decal/poster/D = P.resulting_poster
var/temp_loc = user.loc
code/game/objects/devices/PDA/PDA.dm
+2 -2
View File
@@ -243,7 +243,7 @@
dat += "<li><a href='byond://?src=\ref[src];choice=1'><img src=pda_notes.png> Notekeeper</a></li>"
dat += "<li><a href='byond://?src=\ref[src];choice=2'><img src=pda_mail.png> Messenger</a></li>"
dat += "<li><a href='byond://?src=\ref[src];choice=41'><img src=pda_notes.png> View Crew Manifest</a></li>"
//dat += "<li><a href='byond://?src=\red[src];choice=chatroom'><img src=pda_chatroom.png> Nanotrasen Relay Chat</a></li>"
//dat += "<li><a href='byond://?src=\red[src];choice=chatroom'><img src=pda_chatroom.png> NanoTrasen Relay Chat</a></li>"
if (cartridge)
if (cartridge.access_clown)
@@ -385,7 +385,7 @@
dat += "<br>"
if (5)
dat += "<h4><img src=pda_chatroom.png> Nanotrasen Relay Chat</h4>"
dat += "<h4><img src=pda_chatroom.png> NanoTrasen Relay Chat</h4>"
dat += "<h4><img src=pda_menu.png> Detected Channels</h4>: <li>"
for(var/datum/chatroom/C in chatrooms)
code/game/objects/effect_system.dm
+7 -7
View File
@@ -124,7 +124,7 @@ steam.start() -- spawns the effect
var/i = 0
for(i=0, i<src.number, i++)
spawn(0)
if(holder)
if(holder && !istype(holder,/datum))
src.location = get_turf(holder)
var/obj/effect/effect/steam/steam = new /obj/effect/effect/steam(src.location)
var/direction
@@ -195,7 +195,7 @@ steam.start() -- spawns the effect
if(src.total_sparks > 20)
return
spawn(0)
if(holder)
if(holder && !istype(holder,/datum))
src.location = get_turf(holder)
var/obj/effect/effect/sparks/sparks = new /obj/effect/effect/sparks(src.location)
src.total_sparks++
@@ -265,7 +265,7 @@ steam.start() -- spawns the effect
if(src.total_smoke > 20)
return
spawn(0)
if(holder)
if(holder && !istype(holder,/datum))
src.location = get_turf(holder)
var/obj/effect/effect/harmless_smoke/smoke = new /obj/effect/effect/harmless_smoke(src.location)
src.total_smoke++
@@ -365,7 +365,7 @@ steam.start() -- spawns the effect
if(src.total_smoke > 20)
return
spawn(0)
if(holder)
if(holder && !istype(holder,/datum))
src.location = get_turf(holder)
var/obj/effect/effect/bad_smoke/smoke = new /obj/effect/effect/bad_smoke(src.location)
src.total_smoke++
@@ -494,7 +494,7 @@ steam.start() -- spawns the effect
if(src.total_smoke > 20)
return
spawn(0)
if(holder)
if(holder && !istype(holder,/datum))
src.location = get_turf(holder)
var/iterator = pick(0,1,1,1,2,2,2,3)
var/obj/effect/effect/chem_smoke/smoke = new /obj/effect/effect/chem_smoke(src.location)
@@ -602,7 +602,7 @@ steam.start() -- spawns the effect
if(src.total_smoke > 20)
return
spawn(0)
if(holder)
if(holder && !istype(holder,/datum))
src.location = get_turf(holder)
var/obj/effect/effect/sleep_smoke/smoke = new /obj/effect/effect/sleep_smoke(src.location)
src.total_smoke++
@@ -688,7 +688,7 @@ steam.start() -- spawns the effect
if(src.total_smoke > 20)
return
spawn(0)
if(holder)
if(holder && !istype(holder,/datum))
src.location = get_turf(holder)
var/obj/effect/effect/mustard_gas/smoke = new /obj/effect/effect/mustard_gas(src.location)
src.total_smoke++
code/game/objects/items/blueprints.dm
+1 -1
View File
@@ -63,7 +63,7 @@
var/area/A = get_area()
var/text = {"<HTML><head><title>[src]</title></head><BODY>
<h2>[station_name()] blueprints</h2>
<small>Property of Nanotrasen. For heads of staff only. Store in high-secure storage.</small><hr>
<small>Property of NanoTrasen. For heads of staff only. Store in high-secure storage.</small><hr>
"}
switch (get_area_type())
if (AREA_SPACE)
code/game/objects/items/weapons/RCD.dm
+2 -2
View File
@@ -72,7 +72,7 @@ RCD
afterattack(atom/A, mob/user as mob)
if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//Nanotrasen Matter Jammer TM -Sieve
if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//NanoTrasen Matter Jammer TM -Sieve
disabled = 1
else
disabled = 0
@@ -168,7 +168,7 @@ RCD
/obj/item/weapon/rcd/industrial
name = "industrial rapid construction device"
max_matter = 60
New()
matter = max_matter
return ..()
code/game/objects/items/weapons/grenades.dm
+4 -4
View File
@@ -510,15 +510,15 @@ CRITTER GRENADE
deliveryamt = 5
origin_tech = "materials=3;magnets=4;syndicate=4"
/obj/item/weapon/spawnergrenade/spesscarp
/obj/item/weapon/spawnergrenade/carp
name = "carp delivery grenade"
spawner_type = /obj/effect/critter/spesscarp
spawner_type = /mob/living/simple_animal/carp
deliveryamt = 5
origin_tech = "materials=3;magnets=4;syndicate=4"
/obj/item/weapon/spawnergrenade/elitespesscarp
/obj/item/weapon/spawnergrenade/elitecarp
name = "elite carp delivery grenade"
spawner_type = /obj/effect/critter/spesscarp/elite
spawner_type = /mob/living/simple_animal/carp/elite
deliveryamt = 2
origin_tech = "materials=3;magnets=4;syndicate=4"
code/game/objects/items/weapons/implants/implanter.dm
+2 -3
View File
@@ -114,8 +114,7 @@
..()
/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob)
if(istype(A,/obj/item))
var/obj/item/weapon/implant/compressed/c = imp
c.scanned = A
if(istype(A,/obj/item) && imp)
imp:scanned = A
A.loc.contents.Remove(A)
update()
code/game/objects/items/weapons/manuals.dm
+1 -1
View File
@@ -313,7 +313,7 @@ It is caused by the unexpected circumstances after awakening in cryo (if cloned
<li>Internal armor is plasteel for additional strength.</li>
<li>External armor must be installed in 2 parts, totaling 10 sheets.</li>
<li>Completed mech is more resiliant against fire, and is a bit more durable overall</li>
<li>Nanotrasen is determined to the safety of its <s>investments</s> employees.</li>
<li>NanoTrasen is determined to the safety of its <s>investments</s> employees.</li>
</ol>
</body>
</html>
code/game/objects/items/weapons/surgery_tools.dm
+2 -4
View File
@@ -304,8 +304,8 @@ CIRCULAR SAW
var/mob/living/carbon/human/H = M
var/datum/organ/external/S = H.organs[user.zone_sel.selecting]
if(isnull(S))
CRASH("External organ S is null in surgery_tools.dm")
if(user.zone_sel.selecting == "mouth" || user.zone_sel.selecting == "eyes")
S = H.organs["head"]
if(((user.zone_sel.selecting == "l_arm") || (user.zone_sel.selecting == "r_arm") || (user.zone_sel.selecting == "l_leg") || (user.zone_sel.selecting == "r_leg")) & (istype(M, /mob/living/carbon/human)))
if(S.status & ORGAN_DESTROYED)
@@ -449,8 +449,6 @@ CIRCULAR SAW
return ..()
M:brain_op_stage = 0
S.open = 1
if(!try_bone_surgery(M, user))
return ..()
else
return ..()
code/game/objects/stool.dm
+3
View File
@@ -106,6 +106,9 @@
/obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
if(!istype(M)) return
if(issimpleanimal(user))
user << "\red You are unable to work the complex mechanisms of a buckle!"
return
buckle_mob(M, user)
M.lying = 1
return
code/game/objects/storage/belt.dm
+14 -5
View File
@@ -55,7 +55,11 @@
"/obj/item/weapon/cable_coil",
"/obj/item/device/t_scanner",
"/obj/item/device/analyzer",
"/obj/item/device/pda")
"/obj/item/device/pda",
"/obj/item/weapon/lighter",
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/matchbox"
)
/obj/item/weapon/storage/belt/utility/full/New()
@@ -102,12 +106,15 @@
"/obj/item/weapon/reagent_containers/syringe",
"/obj/item/weapon/reagent_containers/glass/dispenser",
"/obj/item/weapon/reagent_containers/hypospray",
"/obj/item/weapon/lighter/zippo",
"/obj/item/weapon/lighter",
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/matchbox",
"/obj/item/weapon/storage/pill_bottle",
"/obj/item/stack/medical",
"/obj/item/device/flashlight/pen",
"/obj/item/device/pda"
"/obj/item/device/pda",
"/obj/item/clothing/mask/surgical",
"/obj/item/clothing/gloves/latex"
)
@@ -141,10 +148,12 @@
"/obj/item/weapon/camera_test",
"/obj/item/weapon/camera_film",
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/zippo",
"/obj/item/weapon/lighter",
"/obj/item/weapon/matchbox",
"/obj/item/device/taperecorder",
"/obj/item/weapon/evidencebag",
"/obj/item/taperoll/police"
"/obj/item/taperoll/police",
"/obj/item/clothing/mask/gas"
)
/obj/item/weapon/storage/belt/soulstone
code/game/objects/storage/crates.dm
+1 -1
View File
@@ -41,7 +41,7 @@
/obj/structure/closet/crate/contraband
name = "Poster crate"
desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
desc = "A random assortment of posters manufactured by providers NOT listed under NanoTrasen's whitelist."
icon = 'storage.dmi'
icon_state = "crate"
density = 1
code/game/objects/storage/storage.dm
+26
View File
@@ -321,6 +321,32 @@
new /obj/item/weapon/reagent_containers/glass/bottle/ert/boost( src )
return
/obj/item/weapon/storage/PCMBox/New()
..()
contents = list()
sleep(1)
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
return
/obj/item/weapon/storage/AirlockBox/New()
..()
contents = list()
sleep(1)
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
return
/obj/item/weapon/storage/box/syndicate/New()
..()
switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1)))
code/game/objects/watercloset.dm
+1 -1
View File
@@ -117,7 +117,7 @@
/obj/machinery/shower
name = "shower"
desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
desc = "The HS-451. Installed in the 2550s by the NanoTrasen Hygiene Division."
icon = 'watercloset.dmi'
icon_state = "shower"
density = 0
code/game/objects/weapons.dm
+8
View File
@@ -148,6 +148,14 @@
affecting.take_damage(1, 0)
H.UpdateDamageIcon()
H.updatehealth()
else if(ismouse(target))
var/mob/living/simple_animal/mouse/M = target
src.visible_message("\red \icon[src] <b>SPLAT!</b>")
M.splat()
else if(isroach(target))
var/obj/effect/critter/roach/R = target
src.visible_message("\red \icon[src] <b>CRUNCH!</b>")
R.Die()
playsound(target.loc, 'snap.ogg', 50, 1)
icon_state = "mousetrap"
armed = 0