e2557228dc
Copy character slots
2019-03-08 20:17:46 -05:00
bf7686cd02
Merge pull request #5992 from mistyLuminescence/turtlenecks
...
Departmental Turtlenecks
2019-03-08 01:45:09 -05:00
580c41cf1f
golegnahC setadpU
2019-03-06 14:20:38 -05:00
627cdecf66
Subspace Jammer now blocks signalers, suit sensors, lasts longer
2019-03-04 22:58:41 -05:00
c3479bd409
Merge pull request #4571 from VOREStation/upstream-merge-5768
...
[MIRROR] Updates changelog
2019-03-02 20:50:27 -05:00
14fad52791
Merge branch 'master' into upstream-merge-5744
2019-02-23 11:51:40 -05:00
6f2548e47b
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735
2019-02-02 03:55:21 -06:00
ca044dcc2b
Stairs go up
2019-02-01 21:40:21 -05:00
3f90fb2e7d
Merge pull request #5910 from Anewbe/pilot_console_id
...
Pilot consoles require pilot access
2019-02-01 18:01:36 -05:00
439afee2ab
Unclogs powersink drains
2019-01-26 17:54:34 -05:00
4a12e63534
Merge pull request #5896 from Mechoid/A_Tale_Of_Jackets_And_Changelings
...
Changeling & Straight Jacket modifications.
2019-01-26 14:12:47 -05:00
30ab44613d
Merge pull request #4540 from VOREStation/upstream-merge-5714
...
[MIRROR] Borg, Gripper, and Integrated Circuit interaction update.
2019-01-21 11:42:38 -05:00
5198d52c4a
Fixes Teshari hardsuits + adds sprites for most
2019-01-20 23:33:04 -05:00
d3a73ba066
Merge pull request #5885 from Atermonera/botspeak
...
Bots don't speak gibberish
2019-01-20 02:48:12 -05:00
8e9e83fde0
Merge pull request #5858 from Atermonera/suitcooler_pressurization
...
Suit coolers don't overheat in vacuum
2019-01-18 09:15:04 -05:00
c064271fb3
Merge pull request #5843 from Anewbe/gibberish
...
Adds Gibberish
2019-01-16 22:46:41 -05:00
c6c7d98a2d
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
e1cf31c565
Merge pull request #5835 from Cerebulon/ReligionUpdate
...
Updates Religion Lists + Adds Religious Paraphernalia
2019-01-14 03:47:00 -05:00
b43d76b86e
Merge pull request #5823 from Anewbe/egun_stun
...
Egun stun beams are weaker
2019-01-13 00:28:56 -05:00
b5a4a58996
Merge pull request #5790 from Mechoid/Make_Security_Sad
...
Drop the number of shots of normal and sec-xeno tasers back down to 5.
2019-01-06 17:52:23 -05:00
565ca393d8
Merge pull request #5779 from Novacat/spriteadd
...
Emergency tanks start full
2018-12-30 17:08:38 -05:00
16f14eef2e
Merge pull request #4525 from VOREStation/upstream-merge-5732
...
[MIRROR] Added disgusting number of new names to the namelists
2018-12-12 21:25:11 -05:00
98e542144b
Merge pull request #4524 from VOREStation/upstream-merge-5715
...
[MIRROR] Updates Rapid Service Fabricators.
2018-12-12 21:25:02 -05:00
a3ec21ab5f
Updates changelog
2018-12-08 21:58:11 -05:00
0be6662dc5
Adds 12 new futuristic loadout clothing items + colour variants
2018-12-06 16:17:20 -05:00
0a77d0d70d
Borg, Gripper, and Integrated Circuit interaction update.
2018-12-03 20:22:47 -05:00
38395435b5
Merge pull request #5732 from Cerebulon/better_namelists
...
Added disgusting number of new names to the namelists
2018-12-01 00:25:48 -05:00
723a8081a0
Merge pull request #5715 from Mechoid/Service_Fab_Updoot
...
Updates Rapid Service Fabricators.
2018-12-01 00:17:23 -05:00
3fb5d15c43
Merge pull request #5718 from kartagrafi/hairunderwearwhatever
...
New hair + underwear
2018-12-01 00:17:11 -05:00
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
096400b312
Merge pull request #4470 from VOREStation/upstream-merge-5698
...
[MIRROR] Prometheans can process blood without exploding.
2018-11-01 00:22:04 -04:00
00c3e88542
Merge pull request #4469 from VOREStation/upstream-merge-5662
...
[MIRROR] Biogenerator improvements.
2018-10-31 23:59:20 -04:00
feabaafa6e
Prometheans can process blood without exploding.
2018-10-30 18:41:34 -04:00
0e3a60e10c
Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak
...
Biogenerator improvements.
2018-10-30 18:40:18 -04:00
68d1d5cce9
Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature
...
Remplace the plant clippers with a pair hedgetrimmers
2018-10-30 18:37:45 -04:00
e019d0c8ef
Fixes new record bug. ( #5685 )
2018-10-20 03:36:16 -04:00
62ac0986ca
Makes RCDs Clean Again
2018-10-16 14:17:44 -04:00
0cc46c021f
Merge pull request #5653 from Woodratt/10102018_xenomove
...
Xenoflora and Xenobio House Move
2018-10-14 00:29:00 -04:00
51a493427d
Graves ( #5622 )
...
* Adds support for closets storing closets, and graves
* More Grave Things
2018-10-13 17:58:48 -04:00
8c2e0928fa
Merge pull request #4130 from KasparoVy/fix-tesh-hide-again
...
Fix Teshari Hiding Again
2018-10-06 08:25:35 -04:00
7b92808a20
Merge pull request #5621 from Anewbe/hemophilia
...
Fixes some bloodloss bugs
2018-10-02 03:11:29 -04:00
4a00acc6d4
Merge pull request #4291 from VOREStation/upstream-merge-5613
...
[MIRROR] Custom RIG Framework
2018-10-01 09:30:24 -04:00
78b173b50a
Custom RIG Framework ( #5613 )
...
* Framework for Custom RIG sprites.
* Fixfix
2018-09-30 17:50:39 -04:00
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
b8314c336c
Merge pull request #5593 from Anewbe/machine_tweaks
...
Tweaks emitters and Pacman
2018-09-24 11:02:11 -07:00
a942e145b6
Tweaks emitters and Pacman
2018-09-22 18:45:57 -05:00
7afbc18521
Updates changelog
2018-09-22 13:13:03 -07:00
3d4bed20c2
Merge pull request #5548 from Poojawa/pls-stop-moosic
...
Ports /vg/ instrument frame work, adds client based sound pref toggle.
2018-09-19 15:04:06 -05:00
9f24c4eba2
Rig and Spacesuit additions
...
- Added the 'military' Rigsuit from Bay.
- Added 'pmc' rigsuits
- Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh)
- Addition of suit cyclers for exploration and pilot voidsuits
None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first.
2018-09-18 00:35:06 -07:00
22acaf3fcd
Merge pull request #4092 from VOREStation/upstream-merge-5443
...
[MIRROR] Two pAI fixes
2018-09-10 12:32:59 -04:00
Neerti