508 Commits
Author SHA1 Message Date
Luke Vale 2098a55ae7 Adds in the other carpet types as a buyable crate. 2020-07-04 01:18:26 -05:00
BillyBanglesandVirgoBot 75901775a0 Adds marble floor tiles and crafting recipe (#7264)
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
2020-06-06 14:36:25 -04:00
Aronai Sieyes 6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes ea8c29acc8 VS: Dogborg clotter 2020-05-27 16:44:37 -04:00
Aronai Sieyes d58087c18c Fix medical stack exploit 2020-05-27 16:44:19 -04:00
Razgriz 3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai SieyesandGitHub fc849d9e36 Merge pull request #7962 from VOREStation/Arokha/playsound
Alter playsound paradigm
2020-05-19 11:20:52 -04:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes a03a3c0960 Change stack autocombine
Only happens when dropped or pulled by a mob, to avoid problems with stack-using machines and conveyors in mining
2020-05-18 22:35:13 -04:00
Aronai Sieyes 0b858a36c8 These can't be material stacks if they don't have a material 2020-05-18 10:28:18 -04:00
Arokha Sieyes 3911e14936 tg(?) style stack autocombining 2020-05-17 00:47:42 -04:00
Aronai Sieyes d47291ca69 New stack icons for stack items 2020-05-13 17:43:57 -04:00
Aronai Sieyes 0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
Aronai Sieyes 498b942a29 Fiftyspawners try to place themselves in crates if possible
Fixes https://github.com/VOREStation/VOREStation/issues/7163
2020-05-04 21:21:48 -04:00
Aronai SieyesandVirgoBot 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Erik eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
AtermoneraandVirgoBot d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
AtermoneraandVirgoBot 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Shadowfire 3c3817ecd3 Bug fixing, improvements to furniture, jukebox change
Made casino jukebox music finally only appear on its proper jukebox
made tiles have material variable, allowing recovery of carpets from padding
made carpets give padding different colors
made stools also benefit from colored padding
Made modular sofas able to be made from plasteel and plastic
2020-03-07 09:49:36 +01:00
AtermoneraandVirgoBot 11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
NovacatandGitHub 06b7651799 Update nanopaste.dm 2020-02-10 18:59:12 -05:00
AtermoneraandVirgoBot 6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
MechoidandVirgoBot 169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Heroman3003 ac3f9ea671 Makes threshold be based on specific organ rather than straight 10 2019-09-20 12:42:38 +10:00
Heroman c3ad552d64 Implements an icon for Advanced Nanopaste (by Chaoko99) 2019-09-19 03:55:50 +10:00
Heroman 444c06b8d1 Adds edit, variables 2019-09-18 17:24:23 +10:00
Heroman 0fb140d01c Nerfs regular nanopaste, adds advanced one 2019-09-18 16:35:42 +10:00
SpadesandGitHub f15c7cd16e Merge pull request #5514 from CameronWoof/medical-sprites
Resprites Advanced Burn and Trauma Kits
2019-08-03 07:51:27 -04:00
AndrewandVirgoBot e6f54d671a Cyborgs Can See and Repair Holes in Ceiling (#6347)
* Cyborgs Can See and Repair Holes in Ceiling

* Adds changelog because I keep forgetting
2019-07-27 13:06:52 -04:00
CameronWoof 172314f04c more compliance 2019-07-26 23:43:11 -07:00
CameronWoof 2cd2b7a981 code compliance 2019-07-26 23:10:41 -07:00
CameronWoof 1aca0bff38 Resprites Advanced Burn and Trauma Kits 2019-07-26 20:13:09 -07:00
AnewbeandVirgoBot 1adc4790be Merge pull request #6221 from mistyLuminescence/bettersplinting
Head/chest/groin splints
2019-06-21 17:06:38 -04:00
NeertiandNovacat 30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
AtermoneraandNovacat 131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
AnewbeandVirgoBot 2572f3a145 Merge pull request #5747 from Neerti/fulltile_window_improvements
Makes fulltile windows seperate from dir
2018-12-04 14:37:19 -05:00
AtermoneraandVirgoBot 1216f97663 Adds roofing tiles (#5409)
* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects

Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area

* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects

Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area
2018-07-14 15:24:33 -04:00
Unknown 3f63e5933a Keep healing same between bruise/burn 2018-06-27 16:54:15 -04:00
Unknown 729ed3177b Suggested Tweaks 2018-06-27 16:51:20 -04:00
Unknown 51142c08d2 Gauze Tweak 2018-06-27 15:44:29 -04:00
Unknown 528f231f41 Medical Tweaks
- Ointment now treats 3 burn damage per application
- Advanced Trauma Kits treat 6 damage per application, and have 20 uses
- Advanced Burn Kits treat 12 damage per application
- Medical Rescue Suit injector now has 20 units per chem, and uses Inaprovaline, Dylovene, Paracematol, and Dexalin
- Kelotane effectiveness reduced from 6 damage per tick to 4 damage per tick
- Dermaline effectiveness reduced from 12 damage per tick, to 8 damage per tick
- Dexalin metabolizes at 20% of the rate of Dexalin Plus, stats adjusted accordingly (Natje's suggestion)
- Dexalin is now twice as effective (still pales in comparison to Dex Plus)
- Reduced brain healing of Alkysine from 30 to 8
- Vermicetol now works like super tricordazine, healing all damage types at a moderate rate, while metabolizing slowly. Overdose threshold increased from 10u to 15u.
- All pre-filled syringes start capped.
- There is now a 20-second grace period for infection to start ticking up (Note: Using syringes on multiple people renders grace period null and void)
2018-06-27 15:19:52 -04:00
Arokha Sieyes c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018
# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi
2018-05-29 21:05:27 -04:00
Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-05-25 13:23:47 -04:00
deathride58 718ca41ea0 tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1 2018-05-16 01:42:01 -04:00
Arokha Sieyes ab1351f00d Ports the medical item sounds from Bay
A port of https://github.com/Baystation12/Baystation12/pull/21268, which adds sounds to the healing item stacks, taperolls, and hyposprays
2018-04-25 14:39:49 -04:00
Leshana 4e1fa47a0b Reverts gauze disinfecting until a proper solution can be put in place. 2018-04-08 20:24:48 -04:00
Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
Anewbe 88463b5709 Normal brute kits disinfect wounds 2018-03-29 17:51:55 -05:00
Arokha Sieyes 68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00