")
+ t = replacetext(t, "\[logo\]", "
")
t = "[t]"
else // If it is a crayon, and he still tries to use these, make them empty!
@@ -552,47 +552,47 @@
/obj/item/weapon/paper/sop
name = "paper- 'Standard Operating Procedure'"
info = "Alert Levels:\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by reseting the alarm
\nRed- Ejection/Self Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alarms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!" - + /obj/item/weapon/paper/blueshield name = "paper- 'Blueshield Mission Briefing'" - info = "Blueshield Mission Briefing
You are charged with the defence of any persons of importance within the station. This includes but is not limited to The Captain, The Heads of Staff and Central Command staff. You answer directly to the Head of Security who will assist you in achieving your mission.
Where required to achieve your primary responsibility you should liaise with security and share resources, however the day to day security operations of the station are outside of your jurisdiction.
Monitor the health and safety of your principals, identify any potential risks and threats then alert the proper departments to resolve the situation. You are authorized to act as bodyguard to any of the station heads that you determine are most in need of protection, however additional access to their departments shall be granted solely at their discretion.
Observe the station alert system and carry your armaments only as required by the situation or when authorized by the Head of Security or Captain in exceptional cases.
Remember, as an agent of Nanotrasen it is your responsibility to conduct yourself appropriately and you will be held to the highest standard. You will be held accountable for your actions. Security is authorized to search, interrogate or detain you as required by their own procedures. Internal affairs will also monitor and observe your conduct and their mandate applies equally to security and Blueshield operations." - + info = "Blueshield Mission Briefing
You are charged with the defence of any persons of importance within the station. This includes but is not limited to The Captain, The Heads of Staff and Central Command staff. You answer directly to the Head of Security who will assist you in achieving your mission.
Where required to achieve your primary responsibility you should liaise with security and share resources, however the day to day security operations of the station are outside of your jurisdiction.
Monitor the health and safety of your principals, identify any potential risks and threats then alert the proper departments to resolve the situation. You are authorized to act as bodyguard to any of the station heads that you determine are most in need of protection, however additional access to their departments shall be granted solely at their discretion.
Observe the station alert system and carry your armaments only as required by the situation or when authorized by the Head of Security or Captain in exceptional cases.
Remember, as an agent of Nanotrasen it is your responsibility to conduct yourself appropriately and you will be held to the highest standard. You will be held accountable for your actions. Security is authorized to search, interrogate or detain you as required by their own procedures. Internal affairs will also monitor and observe your conduct and their mandate applies equally to security and Blueshield operations." + /obj/item/weapon/paper/ntrep name = "paper- 'Nanotrasen Representative Mission Briefing'" info = "Nanotrasen Representative Mission Briefing
Nanotrasen Central Command has dispatched you to this station in order to liaise with command staff on their behalf. As experienced field officers, the staff on the station are experts in handling their own fields. It is your job however to consider the bigger picture and to direct the staff towards Nanotrasen's corporate interests.
As a civilian, you should consider yourself an advisor, diplomat and intermediary. The command staff do not answer to you directly and are not required to follow your orders nor do you have disciplinary authority over personnel. In all station internal matters you answer to the Head of Personnel who will direct you in your conduct within the station. However you also answer to Central Command who may, as required, direct you in acting on company interests.
Central Command may dispatch orders to the staff through you which you are responsible to communicate, however enforcement of these orders is not your mandate and will be handled directly by Central Command or authorized Nanotrasen personnel. When not specifically directed by Central Command, assist the head of personnel in evaluation of the station and receiving departmental reports.
Your office has been provided with a direct link to Central Command, through which you can issue any urgent reports or requests for Nanotrasen intervention. Remember that any direct intervention is a costly exercise and should be used only when the situation justifies the request. You will be held accountable for any unnecessary usage of Nanotrasen resources.
" - + /obj/item/weapon/paper/armory name = "paper- 'Armory Inventory'" - info = "4 Deployable Barriers
4 Portable Flashers
1 Mechanical Toolbox
2 Boxes of Spare Handcuffs
1 Box of Flashbangs
1 Box of Spare R.O.B.U.S.T. Cartridges
1 Tracking Implant Kit
1 Chemical Implant Kit
1 Box of Tear Gas Grenades
1 Explosive Ordnance Disposal Suit
1 Biohazard Suit
3 Gas Masks
1 Lockbox of Loyalty Implants
1 Ion Rifle
3 Sets of Riot Equipment
2 Sets of Security Hardsuits
1 Ablative Armor Vest
3 Bulletproof Vests
3 Helmets
2 Riot Shotguns
2 Boxes of Beanbag Shells
3 Laser Guns
3 Energy Guns
3 Advanced Tasers" + info = "4 Deployable Barriers
4 Portable Flashers
1 Mechanical Toolbox
2 Boxes of Spare Handcuffs
1 Box of Flashbangs
1 Box of Spare R.O.B.U.S.T. Cartridges
1 Tracking Implant Kit
1 Chemical Implant Kit
1 Box of Tear Gas Grenades
1 Explosive Ordnance Disposal Suit
1 Biohazard Suit
3 Gas Masks
1 Lockbox of Loyalty Implants
1 Ion Rifle
3 Sets of Riot Equipment
2 Sets of Security Hardsuits
1 Ablative Armor Vest
3 Bulletproof Vests
3 Helmets
2 Riot Shotguns
2 Boxes of Beanbag Shells
3 Laser Guns
3 Energy Guns
3 Advanced Tasers" /obj/item/weapon/paper/firingrange - name = "paper- 'Firing Range Instructions'" + name = "paper- 'Firing Range Instructions'" info = "Directions:
First you'll want to make sure there is a target stake in the center of the magnetic platform. Next, take an aluminum target from the crates back there and slip it into the stake. Make sure it clicks! Next, there should be a control console mounted on the wall somewhere in the room.
This control console dictates the behaviors of the magnetic platform, which can move your firing target around to simulate real-world combat situations. From here, you can turn off the magnets or adjust their electromagnetic levels and magnetic fields. The electricity level dictates the strength of the pull - you will usually want this to be the same value as the speed. The magnetic field level dictates how far the magnetic pull reaches.
Speed and path are the next two settings. Speed is associated with how fast the machine loops through the designated path. Paths dictate where the magnetic field will be centered at what times. There should be a pre-fabricated path input already. You can enable moving to observe how the path affects the way the stake moves. To script your own path, look at the following key:
N: North
S: South
E: East
W: West
C: Center
R: Random (results may vary)
; or &: separators. They are not necessary but can make the path string better visible." - + /obj/item/weapon/paper/holodeck - name = "paper- 'Holodeck Disclaimer'" + name = "paper- 'Holodeck Disclaimer'" info = "Brusies sustained in the holodeck can be healed simply by sleeping." - + /obj/item/weapon/paper/spells - name = "paper- 'List of Available Spells (READ)'" - info = "
LIST OF SPELLS AVAILABLE
Magic Missile:
This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage.
Fireball:
This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you.
Disintegrate:This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown.
Disable Technology:
This spell disables all weapons, cameras and most other technology in range.
Smoke:
This spell spawns a cloud of choking smoke at your location and does not require wizard garb.
Blind:
This spell temporarly blinds a single person and does not require wizard garb.
Forcewall:
This spell creates an unbreakable wall that lasts for 30 seconds and does not require wizard garb.
Blink:
This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience.
Teleport:
This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable.
Mutate:
This spell causes you to turn into a hulk, and gain telekinesis for a short while.
Ethereal Jaunt:
This spell creates your ethereal form, temporarily making you invisible and able to pass through walls.
Knock:
This spell opens nearby doors and does not require wizard garb.
LIST OF SPELLS AVAILABLE
Magic Missile:
This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage.
Fireball:
This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you.
Disintegrate:This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown.
Disable Technology:
This spell disables all weapons, cameras and most other technology in range.
Smoke:
This spell spawns a cloud of choking smoke at your location and does not require wizard garb.
Blind:
This spell temporarly blinds a single person and does not require wizard garb.
Forcewall:
This spell creates an unbreakable wall that lasts for 30 seconds and does not require wizard garb.
Blink:
This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience.
Teleport:
This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable.
Mutate:
This spell causes you to turn into a hulk, and gain telekinesis for a short while.
Ethereal Jaunt:
This spell creates your ethereal form, temporarily making you invisible and able to pass through walls.
Knock:
This spell opens nearby doors and does not require wizard garb.
Objective #1. Kill the God damn AI in a fire blast that it rocks the station. Success!
Objective #2. Escape alive. Failed." - + name = "paper- 'Mission Objectives'" + info = "The Syndicate have cunningly disguised a Syndicate Uplink as your PDA. Simply enter the code \"678 Bravo\" into the ringtone select to unlock its hidden features.
Objective #1. Kill the God damn AI in a fire blast that it rocks the station. Success!
Objective #2. Escape alive. Failed." + /obj/item/weapon/paper/russiannuclearoperativeobj - name = "paper- 'Objectives of a Nuclear Operative'" - info = "Objective #1: Destroy the station with a nuclear device." - + name = "paper- 'Objectives of a Nuclear Operative'" + info = "Objective #1: Destroy the station with a nuclear device." + /obj/item/weapon/paper/clownship - name = "paper- 'Note'" + name = "paper- 'Note'" info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!" - + /obj/item/weapon/paper/crumpled name = "paper scrap" icon_state = "scrap" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 6b6332eb65e..99dd27d88d6 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -222,19 +222,33 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. /obj/item/weapon/gun/energy/kinetic_accelerator name = "proto-kinetic accelerator" - desc = "According to Nanotrasen accounting, this is mining equipment. It's been modified to the legal limit on power output, and often serves as a miner's first defense against hostile alien life; it's not very powerful unless used in a low pressure environment." - icon_state = "freezegun" - item_state = "shotgun" + desc = "According to Nanotrasen accounting, this is mining equipment. It's been modified for extreme power output to crush rocks, but often serves as a miner's first defense against hostile alien life; it's not very powerful unless used in a low pressure environment." + icon_state = "kineticgun" + item_state = "kineticgun" + icon_override = 'icons/mob/in-hand/guns.dmi' projectile_type = "/obj/item/projectile/kinetic" - cell_type = "/obj/item/weapon/cell/crap" + fire_sound = 'sound/weapons/Kenetic_accel.ogg' charge_cost = 5000 + cell_type = "/obj/item/weapon/cell/crap" + var/overheat = 0 + var/recent_reload = 1 + +/obj/item/weapon/gun/energy/kinetic_accelerator/Fire() + overheat = 1 + spawn(20) + overheat = 0 + recent_reload = 0 + ..() /obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(var/mob/living/user/L) + if(overheat || recent_reload) + return power_supply.give(5000) - playsound(src.loc, 'sound/weapons/shotgunpump.ogg', 60, 1) + playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) + recent_reload = 1 + update_icon() return - /obj/item/weapon/gun/energy/disabler name = "disabler" desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse." diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index ec20788aaed..e2e643a1111 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -187,38 +187,15 @@ obj/item/projectile/kinetic/New() range-- if(range <= 0) new /obj/item/effect/kinetic_blast(src.loc) - delete() + del(src) -/obj/item/projectile/kinetic/on_hit(var/atom/target) +/obj/item/projectile/kinetic/on_hit(atom/target) var/turf/target_turf= get_turf(target) if(istype(target_turf, /turf/simulated/mineral)) var/turf/simulated/mineral/M = target_turf M.GetDrilled() new /obj/item/effect/kinetic_blast(target_turf) - ..(target,blocked) - -/obj/item/projectile/kinetic/Bump(atom/A as mob|obj|turf|area) - if(!loc) return - if(A == firer) - loc = A.loc - return - - if(src)//Do not add to this if() statement, otherwise the meteor won't delete them - - if(A) - var/turf/target_turf = get_turf(A) - //testing("Bumped [A.type], on [target_turf.type].") - if(istype(target_turf, /turf/unsimulated/mineral)) - var/turf/simulated/mineral/M = target_turf - M.GetDrilled() - // Now we bump as a bullet, if the atom is a non-turf. - if(!isturf(A)) - ..(A) - qdel(src) // Comment this out if you want to shoot through the asteroid, ERASER-style. - return 1 - else - qdel(src) - return 0 + ..() /obj/item/effect/kinetic_blast name = "kinetic explosion" @@ -228,5 +205,4 @@ obj/item/projectile/kinetic/New() /obj/item/effect/kinetic_blast/New() spawn(4) - del(src) - + del(src) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 4c6c95129a5..2e38631ce6f 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -646,6 +646,7 @@ datum if((M.mind in ticker.mode.cult) && prob(10)) M << "\blue A cooling sensation from inside you brings you an untold calmness." ticker.mode.remove_cultist(M.mind) + ticker.mode.remove_all_cult_icons_from_client(M.client) // fixes the deconverted's own client not removing their mob's cult icon for(var/mob/O in viewers(M, null)) O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. // Vamps react to this like acid diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 6a38b825a35..500703563e8 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1032,6 +1032,18 @@ datum S.loc = get_turf_loc(holder.my_atom) + slimeinaprov + name = "Slime Inaprovaline" + id = "m_inaprov" + result = "inaprovaline" + required_reagents = list("water" = 5) + result_amount = 3 + required_other = 1 + required_container = /obj/item/slime_extract/grey + on_reaction(var/datum/reagents/holder) + feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") + + slimemonkey name = "Slime Monkey" id = "m_monkey" @@ -1119,6 +1131,59 @@ datum // for(var/mob/O in viewers(get_turf_loc(holder.my_atom), null)) // O.show_message(text("\red The slime core fizzles disappointingly,"), 1) + + slimecritlesser + name = "Slime Crit Lesser" + id = "m_tele3" + result = null + required_reagents = list("blood" = 1) + result_amount = 1 + required_container = /obj/item/slime_extract/gold + required_other = 1 + on_reaction(var/datum/reagents/holder) + feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") + for(var/mob/O in viewers(get_turf(holder.my_atom), null)) + O.show_message(text("The slime extract begins to vibrate violently !"), 1) + spawn(50) + + if(holder && holder.my_atom) + + var/blocked = list(/mob/living/simple_animal/hostile, + /mob/living/simple_animal/hostile/pirate, + /mob/living/simple_animal/hostile/pirate/ranged, + /mob/living/simple_animal/hostile/russian, + /mob/living/simple_animal/hostile/russian/ranged, + /mob/living/simple_animal/hostile/syndicate, + /mob/living/simple_animal/hostile/syndicate/melee, + /mob/living/simple_animal/hostile/syndicate/melee/space, + /mob/living/simple_animal/hostile/syndicate/ranged, + /mob/living/simple_animal/hostile/syndicate/ranged/space, + /mob/living/simple_animal/hostile/alien/queen/large, + /mob/living/simple_animal/hostile/retaliate, + /mob/living/simple_animal/hostile/retaliate/clown, + /mob/living/simple_animal/hostile/mushroom, + /mob/living/simple_animal/hostile/asteroid, + /mob/living/simple_animal/hostile/asteroid/basilisk, + /mob/living/simple_animal/hostile/asteroid/goldgrub, + /mob/living/simple_animal/hostile/asteroid/goliath, + /mob/living/simple_animal/hostile/asteroid/hivelord, + /mob/living/simple_animal/hostile/asteroid/hivelordbrood, + /mob/living/simple_animal/hostile/carp/holocarp, + /mob/living/simple_animal/hostile/mining_drone + )//exclusion list for things you don't want the reaction to create. + var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs + + playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) + + for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) + if(M:eyecheck() <= 0) + flick("e_flash", M.flash) + + var/chosen = pick(critters) + var/mob/living/simple_animal/hostile/C = new chosen + C.faction |= "neutral" + C.loc = get_turf(holder.my_atom) + //Silver slimebork name = "Slime Bork" diff --git a/code/setup.dm b/code/setup.dm index b138b2f2cd6..ab6e81d477c 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -211,6 +211,9 @@ var/MAX_EXPLOSION_RANGE = 14 #define MASKCOVERSMOUTH 2048 // on other items, these are just for mask/head #define HEADCOVERSMOUTH 2048 +#define HEADBANGPROTECT 4096 +#define EARBANGPROTECT 1024 + #define NOSLIP 1024 //prevents from slipping on wet floors, in space etc #define OPENCONTAINER 4096 // is an open container for chemistry purposes diff --git a/html/images/ntlogo.png b/html/images/ntlogo.png new file mode 100644 index 00000000000..d5614a964ee Binary files /dev/null and b/html/images/ntlogo.png differ diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index 8f1e3ff0990..f056d9068c4 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index c4050aed844..f3d08f645c3 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/in-hand/guns.dmi b/icons/mob/in-hand/guns.dmi index 99093c521cf..9609c6d23f7 100644 Binary files a/icons/mob/in-hand/guns.dmi and b/icons/mob/in-hand/guns.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index f6ce90f5790..a105ed232af 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 1e6d7e6b731..3bac44a808a 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index 14b94a22744..c4ecd1b70f3 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index e87c6c34222..d4049be0bb3 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/paradise.dme b/paradise.dme index f970e3cccba..69918097b9c 100644 --- a/paradise.dme +++ b/paradise.dme @@ -18,6 +18,7 @@ #define FILE_DIR "code/WorkInProgress/IndexLP" #define FILE_DIR "code/WorkInProgress/Susan" #define FILE_DIR "html" +#define FILE_DIR "html/images" #define FILE_DIR "icons" #define FILE_DIR "icons/48x48" #define FILE_DIR "icons/ass" diff --git a/sound/weapons/Kenetic_accel.ogg b/sound/weapons/Kenetic_accel.ogg new file mode 100644 index 00000000000..ab525baf9af Binary files /dev/null and b/sound/weapons/Kenetic_accel.ogg differ diff --git a/sound/weapons/kenetic_reload.ogg b/sound/weapons/kenetic_reload.ogg new file mode 100644 index 00000000000..7f2c779fa62 Binary files /dev/null and b/sound/weapons/kenetic_reload.ogg differ