cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,046 Commits 8 Branches 0 Tags
5a9e1f1566cdbab76c38f8cc63bc3eec58726f65
Commit Graph

673 Commits

Author SHA1 Message Date
Spades
3882cb8176 Merge pull request #4867 from Novacat/nova-survival 
Species Tweaks
 2019-03-30 09:58:29 -04:00
mistyLuminescence
26ead98d6f Loadout item role tweaks (#5998) 
* Loadout ItemRoles tweak
 2019-03-30 04:10:16 -04:00
Unknown
2265616bc5 Species Tweaks 
- Removes Reagent tags for Akula, Neverean, and Sergals, as they were not used at all.
- Adds Reagent tag for Xenochimera.
- Xenochimera now get 25% Hunger satisfaction from Nutriment (Previously 100%)
- Fixes a Xenochimera-related runtime
- Increases the heat discomfort level of Tajarans by 6 kelvin
 2019-03-29 09:39:30 -04:00
Novacat
ca660879fd Merge pull request #4862 from Novacat/nova-pathfinder 
Ports veils from Baystation
 2019-03-28 22:12:53 -04:00
Novacat
e2afa12e38 Merge pull request #4841 from VOREStation/upstream-merge-5992 
[MIRROR] Departmental Turtlenecks
 2019-03-28 22:00:31 -04:00
Novacat
7768216c64 Merge pull request #4801 from VOREStation/upstream-merge-5974 
[MIRROR] Fixes departmental teshari cloaks and coats
 2019-03-28 21:09:51 -04:00
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
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829 
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
 2019-03-27 16:37:45 -04:00
Novacat
b717399d21 Merge pull request #4681 from VOREStation/upstream-merge-5838 
[MIRROR] Fixes a couple of tiny glasses bugs
 2019-03-27 15:51:48 -04:00
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
Novacat
d4f7e752eb Merge pull request #4675 from VOREStation/upstream-merge-5828 
[MIRROR] Fixes antagonist options not appearing in preferences
 2019-03-27 15:17:38 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Novacat
f4aad05ea1 Merge branch 'master' into upstream-merge-5838 2019-03-27 14:26:19 -04:00
Unknown
b3ee0e766f Why is this even a conflict. 2019-03-27 14:24:57 -04:00
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Novacat
0b13775536 Merge pull request #4596 from VOREStation/upstream-merge-5783 
[MIRROR] Removes "allowed_roles" from Cloaks
 2019-03-27 03:03:09 -04:00
Unknown
893db47d9d Adds a mining veil for Mining. 2019-03-20 18:20:45 -04:00
Unknown
944babf622 Ports veils from Baystation 
Thought about kicking this to Polaris, but, pretty sure the Taj species maintainer would not be interested in them.

Might make some additional changes later, as I saw some problems with the code while making this.
 2019-03-20 16:57:07 -04:00
Atermonera
bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks 
Departmental Turtlenecks
 2019-03-08 01:45:09 -05:00
Spades
41bcb6a729 Merge pull request #4805 from Sebbe9123/master 
Changes vore egg_types to not interfere with mob egg_types.
 2019-03-02 08:03:58 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Sebbe9123
22c9bd416e changes vore eggtype to not mess with mob eggtype 2019-02-25 12:03:07 +01:00
Heroman3003
885fe76664 Fixes departmental teshari cloaks and coats (#5974) 
* Fixes departmental teshari clothes

Some missing vars, icons, misaligned qm undercoat, forgotten edits on some icon names.

* adjusted names and descriptions of departmental teshari cloaks

* Brought loadout entries to match existing ones.

* Puts RD on command tesh stuff WL, removes leftover comment

* Fixes a one-space typo in QM tesh cloak description.
 2019-02-24 17:15:30 -05:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
Spades
14fad52791 Merge branch 'master' into upstream-merge-5744 2019-02-23 11:51:40 -05:00
Anewbe
916e32e9eb Fixes a couple of tiny glasses bugs 2019-01-15 15:00:31 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Neerti
5d102e8ed2 Merge pull request #5828 from Cerebulon/traitorFix 
Fixes antagonist options not appearing in preferences
 2019-01-13 00:29:09 -05:00
Naidh
02ba929795 Removes "allowed_roles" from Cloaks (#5783) 
Department ponchos had this same line removed back in February as part of #4843 - now, the same is (hopefully) being done for cloaks.
 2018-12-18 21:19:18 -05:00
Spades
9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes 
Expedition Job and Gear tweaks
 2018-12-08 09:44:15 -05:00
Cerebulon
0be6662dc5 Adds 12 new futuristic loadout clothing items + colour variants 2018-12-06 16:17:20 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Unknown
98433abd03 Code cleanup 
Now with 75% Less //VOREStation Edit
 2018-11-18 14:28:40 -05:00
Unknown
dcfecf6e85 Wrong file edited, loadouts configured proper 2018-11-05 20:00:31 -05:00
Unknown
433fa46ca8 Fixes some oversights 2018-11-05 14:23:35 -05:00
Aronai Sieyes
aca8fa397e Merge pull request #4450 from VOREStation/upstream-merge-5692 
[MIRROR] Correctly fix surgery caps selection this time.
 2018-10-23 12:33:29 -04:00
Atermonera
b2e676d216 Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix 
Correctly fix surgery caps selection this time.
 2018-10-22 20:55:18 -04:00
Shophaune
7266f28757 Fix for duplicated loadout descriptions (#5694) 
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Borrowing Ibnesquik's descriptions to fix this issue quickly.
 2018-10-21 14:23:59 -04:00
Atermonera
54a24d244f Merge pull request #5657 from lbnesquik/Kates-Cap-Fix 
Move surgery caps into their own selection.
 2018-10-13 17:13:32 -04:00
Aronai Sieyes
f9159296f9 Merge pull request #4358 from VOREStation/aro-traitstats 
Log trait and species usage for metrics
 2018-10-12 01:45:54 -04:00
Arokha Sieyes
ea0d6fc5a1 Log trait and species usage for metrics 
Just some stuff for use in building statistics about characters
 2018-10-11 20:49:33 -04:00
lbnesquik
986dc248b0 Adds nevrean eggs. 2018-10-06 10:06:28 +02:00
Mewchild
19ed4485c1 Changes Secpatch Path in Loadout 2018-10-01 09:36:16 -05:00
Spades
587fd193a1 Merge pull request #4226 from Mewchild/MC-SecPatch 
Adds Security Eyepatch
 2018-10-01 09:20:37 -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
Spades
c0b0621503 Merge pull request #4166 from deathride58/characterdirectory 
Adds the character directory
 2018-09-27 19:35:53 -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
Anewbe
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