Unknown
ad181e797a
Conflict Resolution
...
Also fixes a compiling error with previous PR
2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda
Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 16:54:32 -04:00
Unknown
ec19a66eff
Conflict Resolution
2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
Neerti
585b688709
Adds Identification System, New Autoinjectors
2019-03-27 02:25:55 -04:00
Unknown
03dcb65c01
Fixes most of the issues
2019-03-27 00:38:44 -04:00
Neerti
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Unknown
976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
Spades
c6c7d98a2d
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
Unknown
b48efb138f
More merge conflict fixes
...
I think I got them all.
2018-12-13 00:33:32 -05:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Spades
b28213c906
Merge pull request #4356 from Novacat/nova-ert
...
ERT Equipment Redo
2018-10-20 17:34:41 -04:00
Arokha Sieyes
ce187f64ed
Fixup other vorestation things
...
Stop using the web editor please
2018-10-16 12:05:32 -04:00
Anewbe
12e34de332
Move almost everything food related into the kitchen module.
2018-10-15 15:47:14 -04:00
Unknown
7ca817d0c8
I messed up copypasta and forgot to change iron to nutriment
2018-10-12 20:59:29 -04:00
Unknown
3f4039d027
ERT Equipment Redo
...
- Removes Light Machine Guns, Grenade Launchers, Matebas, and all 7mm battle and sniper rifles
- Adds 5mm Assault Rifles, .45 revolvers
- Reduces the number of powerful weapon types (energy sniper, combat shotgun)
- Replaces the submachinegun with a weaker one, reduces the number, adds extra magazines
- Adds a lot of things to the medical and engineering ERT sections
- Replaces weapon power cells with self-charging weapon power cells
- Adds a few recharging high capacity power cells (Reskin of slime power cell), and a bunch of hyper capacity power cells
- Adds some miscellaneous devices (Translocator, shelter capsule, binoculars) to the hardsuit section
- Replaces the hardsuit section's grenade launchers with two sprint modules and a micro pharmacy
- Adds LMGs to Zulu's armory
2018-10-10 19:02:48 -04:00
Spades
d243d80132
Merge pull request #4290 from VOREStation/upstream-merge-5614
...
[MIRROR] Hyposprays can now have different sounds
2018-10-01 09:29:43 -04:00
Spades
b8f240f199
Merge pull request #4282 from VOREStation/sync-09272018
...
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
Atermonera
ebb89d6c59
Merge pull request #5614 from Anewbe/autospray
...
Hyposprays can now have different sounds
2018-09-30 03:45:40 -04:00
Arokha Sieyes
b099ac6e4c
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
...
# Conflicts:
# code/__defines/holomap.dm
# code/__defines/mobs.dm
# code/_helpers/icons.dm
# code/_helpers/unsorted.dm
# code/_onclick/hud/hud.dm
# code/_onclick/item_attack.dm
# code/controllers/Processes/supply.dm
# code/controllers/subsystems/planets.dm
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/science.dm
# code/datums/supplypacks/security.dm
# code/datums/supplypacks/supply.dm
# code/game/area/Space Station 13 areas.dm
# code/game/atoms_movable.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/jukebox.dm
# code/game/machinery/recharger.dm
# code/game/machinery/vending.dm
# code/game/mecha/equipment/tools/medical_tools.dm
# code/game/mecha/equipment/weapons/weapons.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/megaphone.dm
# code/game/objects/items/poi_items.dm
# code/game/objects/items/weapons/implants/implantlanguage.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/objects/structures/flora/trees.dm
# code/game/objects/structures/plasticflaps.dm
# code/game/supplyshuttle.dm
# code/game/turfs/simulated/wall_attacks.dm
# code/modules/admin/admin_verbs.dm
# code/modules/assembly/infrared.dm
# code/modules/client/client procs.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/client/preferences.dm
# code/modules/clothing/suits/miscellaneous.dm
# code/modules/holomap/holomap_datum.dm
# code/modules/holomap/station_holomap.dm
# code/modules/integrated_electronics/core/printer.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/death.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/robot.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob_movement.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/subtypes/standard.dm
# code/modules/planet/weather.dm
# code/modules/power/cable.dm
# code/modules/power/fusion/core/core_control.dm
# code/modules/power/fusion/fuel_assembly/fuel_control.dm
# code/modules/power/fusion/gyrotron/gyrotron_control.dm
# code/modules/projectiles/gun.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# config/names/first_name_skrell.txt
# config/names/last_name_skrell.txt
# icons/mob/head.dmi
# icons/mob/robots.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/obj/ammo.dmi
# icons/obj/gun.dmi
# icons/obj/mining.dmi
# icons/obj/projectiles.dmi
# icons/obj/rig_modules.dmi
# icons/obj/surgery.dmi
# icons/turf/walls.dmi
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-8.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
# maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
# maps/submaps/surface_submaps/mountains/deadspy.dmm
# maps/submaps/surface_submaps/mountains/mountains_areas.dm
# maps/submaps/surface_submaps/plains/Thiefc.dmm
# maps/~map_system/maps.dm
# vorestation.dme
2018-09-27 18:01:09 -04:00
Mechoid
b3f40308ca
Adds some Holy drinks, and Promethean-safe drinks / acclimators. ( #5574 )
...
* Adds some Holy drinks, and Promethean-safe drinks / acclimators.
* Carbon + Water + Oil = Sludge
* TRUEFALSE & * removed
2018-09-22 18:53:55 -05:00
Mewchild
d01488a1cd
Reverts Syringe infections
2018-08-13 10:53:02 -05:00
Anewbe
7f84aeab9f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool
2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05:00
avabee
6af40c4cec
Fixes a typo with kitsune udon.
...
Goodbye, Friend Egg. You will be sorely missed.
2018-07-12 01:30:08 -05:00
Anewbe
af08909d49
Merge pull request #5389 from VOREStation/pol-hypo
...
Fix hypospray exploit
2018-07-04 11:50:55 -04:00
Arokha Sieyes
a150728e08
Fix hypospray exploit
2018-07-03 18:05:41 -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
Anewbe
a0ffc104bf
Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter
2018-06-16 13:41:40 -04:00
Anewbe
c72807f458
Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter ( #5355 )
...
* Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter
* Changelog
* Corrects liver cost oversight
2018-06-16 10:41:20 -07: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
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
c09412c33e
Implements the Mining Equipment Vendor
...
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
2018-04-24 18:18:54 -04:00
Leshana
2a4182cc8e
First effort fix of the slimes integration with taur riding.
2018-04-22 15:24:48 -04:00
Leshana
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.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/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
Arokha Sieyes
9f4a14b171
POLARIS: Weird snacks runtime
2018-03-25 17:09:33 -04:00
Arokha Sieyes
00a4466dc3
VS: Sometimes you use syringes on other things
2018-03-17 21:44:13 -04:00
Arokha Sieyes
14bdc519e4
POLARIS: Weird snacks runtime
2018-03-17 21:24:11 -04:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Arokha Sieyes
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
Leshana
f2fff2358b
Fix DEBUG: Runtime in syringes_vr.dm,17: Cannot execute null.Cut()
2018-03-11 16:56:16 -04:00
Arokha Sieyes
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
Mechoid
06eb3e5e47
Merge pull request #5018 from Anewbe/syringe
...
Syringe adjustments
2018-03-10 13:28:00 -08:00
Anewbe
f2da429eab
Merge pull request #4980 from MisterLayne/ED_CLN
...
Adds the ED-CLN
2018-03-10 15:04:07 -06:00
Anewbe
7ed36f51f2
Syringe adjustments
2018-03-07 18:46:50 -06:00
MisterLayne
21c9cd0a05
fixes code, and adds changelog (hope I did it right)
2018-03-06 20:52:55 -05:00
Aronai Sieyes
43aa168f71
Merge pull request #3174 from VOREStation/aro-syringes
...
Make syringes not require 3 clicks to inject
2018-03-05 18:41:53 -05:00
Arokha Sieyes
8e055e9c18
VS: Move this line for syringe time change
2018-03-04 12:21:41 -05:00
Arokha Sieyes
5ece4638a9
POLARIS: Syringes inject with one click rather than three
2018-03-04 12:21:40 -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
