cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-28 08:43:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 9 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

117 Commits

Author SHA1 Message Date
Necaladun 2f3caa9b0c Pennywise items, disposal fix 2014-09-03 09:44:45 +09:30
MrSnapwalk 75b2ca2dd2 Psychiatrist/Psychologist update. 
Conflicts:
	code/game/jobs/job/medical.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-08-02 22:23:39 -04:00
ZomgPonies f1d8804a16 WTF vg, next thing you know you'll be burning down the library. 2014-07-25 18:27:38 -04:00
Heredth 4328993913 Added nazi uniforms. 
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
 2014-07-25 18:12:12 -04:00
Necaladun ded5462196 Fluff items 
Ion chef medal and purple zippo
 2014-07-22 17:51:02 +09:30
ZomgPonies 1eb02b5cf4 Overhauled holsters and webbings 2014-07-15 04:02:24 -04:00
ZomgPonies cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
Necaladun 22f4f9004f Donator fluff item 
Flagbearer's rebel outfit.
 2014-06-11 15:52:01 +09:30
Erthilo dfce6736fb Tons more vox clothes. 
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
	code/modules/clothing/masks/breath.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/suits/labcoat.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/mask.dmi
	icons/mob/species/vox/masks.dmi
	icons/mob/species/vox/shoes.dmi
	icons/mob/species/vox/uniform.dmi
 2014-06-08 18:13:22 -04:00
ZomgPonies a521f88e95 Final dodgeball fixes 2014-05-23 01:15:24 -04:00
ZomgPonies 96ee35e5de Added Mechanic karma job, builds and repairs spacepods, works under the CE 2014-05-19 06:49:35 -04:00
Erthilo 288385ba66 Adds vox fitted uniforms and shoes to all jobs excluding sec, mime, and clown. 
Conflicts:
	code/modules/clothing/under/color.dm
	code/modules/clothing/under/jobs/civilian.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox_w_uniform.dmi
 2014-05-13 21:57:50 -04:00
Necaladun 38b92bde0e Vox jumpsuits 
Ripped vox jumpsuits for pancakeflipper
 2014-05-13 03:34:46 +09:30
Necaladun 3e3fc0f314 Wisewill Sprites 
Added wisewills sprites - bane stuff, sec rig fixes
 2014-04-15 00:29:51 +09:30
ZomgPonies 2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00
ZomgPonies 04542065e5 Tons of new Mafia-theme stuff 2013-12-29 14:30:29 -05:00
ZomgPonies 77778e7ea5 Add maid uniform 2013-12-28 08:48:07 -05:00
ZomgPonies 02d24dfc6b Roman Armor 2013-10-27 00:06:22 -04:00
ZomgPonies e708b92560 Paramedic clothing 2013-09-30 01:14:05 -04:00
ZomgPonies e81596ff2f Colored fat uniforms 2013-09-26 06:47:09 -04:00
ZomgPonies 900a3526bf poop syndrome in disease and disease2 2013-09-25 06:48:59 -04:00
ZomgPonies fcbdb53bbb Bunch of FAT fixes 2013-09-24 19:00:40 -04:00
ZomgPonies 640e38ce23 Massive code fix to get the codebase ready to compile in BYOND 500 2013-09-15 23:58:16 -04:00
ZomgPonies 494ce26bb9 Added custom clothing requested by admins 2013-09-15 20:21:04 -04:00
ZomgPonies c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00
Zuhayr 50d0c18165 Added a knife harness/duelling knives. 2013-08-08 20:48:54 -07:00
Segrain 47db87fcfe Cameras for strike teams. 2013-07-28 01:59:03 +03:00
Zuhayr 3192323c19 Fixes #3200 2013-06-29 16:57:08 -07:00
Zuhayr bff96e3fb7 Added holobadges, Security-imprintable display accessories. 2013-06-24 20:55:24 -07:00
Asanadas 7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker. 
Everything should be working correctly.
 2013-06-13 09:41:52 -04:00
Chinsky bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
 2013-06-12 23:11:28 +04:00
Zuhayr 8b518f5639 Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental. 2013-06-08 19:20:02 -07:00
Chinsky 7023ed0a52 Added webbings and vests. 
Attach to jumpsuit. Use Look in storage verb (Object tab) to open. Click on storage boxes to add items.
 2013-06-05 21:17:22 +04:00
MisterBook fd8d61aa8b New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations. 
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.

HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.

Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.

Icon adjustments.
 2013-06-04 22:41:23 -05:00
MisterBook 06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
fauxtada e384c90093 minor changes 
- Fixed accesses to security office doors.
- Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one.
- Fixed Writerer's custom item thing. Was attached to wrong character.
 2013-04-30 02:37:43 -07:00
fauxtada c1991ba0dd Player Requests Edition 
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
 2013-04-24 03:04:35 -07:00
fauxtada 272d7925cf Sorry, sorry! 
The last commit was full of compiling errors, this fixes that one.
 2013-04-22 13:29:23 -07:00
fauxtada 44a67167b3 Uniform Closet Changes 
- Adjusted the items that spawn in the mixed wardrobe. Now includes:
--- Colorful shoes.
--- Plaid Skirts. Lady Power.
--- Leather shoes.
- Put dispatcher uniform in security closet for playtesting purposes.
- Nurse dress, orderly uniform, and first responder jacket now spawn in medical closet. Man that thing is full of stuff.
 2013-04-21 22:50:52 -07:00
fauxtada 3fa1314c01 Fancy Formal Wear Overhaul 
- Adds female dress unforms to Captains, RD, and HoP's closets.
- Fixes up the bride's dresses so they are working when spawned.
- Fixed Wedding Branch. - five wedding dresses.
- Added Dress Branch. - twelve dresses - that's including dresses moved over from the wedding branch.
 2013-04-17 22:03:38 -07:00
Asanadas 0a21e8a4f4 Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-21 02:59:29 -04:00
Cael_Aislinn fb2b2a1d52 various compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:43:54 +10:00
Cael_Aislinn bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00
Cael_Aislinn 8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 22:14:46 +10:00
d_h2005@yahoo.com 788b2576cd -New sprites for spider cocoons and webs. 
-Adds green-striped medbay deptsec armbands, at the behest of ikarrus

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5540 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-13 09:09:50 +00:00
Cael_Aislinn bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 22:12:31 +10:00
Chinsky 08b52b0f04 Added alternative uniform for Security officers and Security armor vest. 2013-01-10 14:21:22 +04:00
d_h2005@yahoo.com c3c1c94d7e -Adds sprites and defines for departmental armbands, attachable to jumpsuits. 
-Fixes backwards police-baton inhand sprites.
-Nudges the lusty xeno poster over a few pixels, so it fits better in-game.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5481 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-07 03:14:35 +00:00
d_h2005@yahoo.com 12e8a32eb2 Tiny adjustment for Ikarrus: The alternate HoS jumpsuit is not a subtype of the normal, and therefore counts towards fulfillment of the Steal objective. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5365 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-21 04:28:11 +00:00
SkyMarshal ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00