cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,928 Commits 5 Branches 0 Tags
aca8fa397e70508f19332e98703b4d25af7bae45
Commit Graph

636 Commits

Author SHA1 Message Date
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
Atermonera
f2ac15be91 Merge pull request #5511 from Anewbe/descriptors 
Ports character physical descriptors from Bay
 2018-09-17 11:21:28 -07:00
Anewbe
c12d7e25b0 Readds size traits 2018-09-13 17:22:11 -05:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Mewchild
6446d813da Adds Security Eyepatch 2018-09-07 17:52:29 -05:00
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref 
Also shifts sound files which is 98% of the bulk here.
 2018-09-05 03:35:34 -05:00
Spades
7b86d2ba4f Merge pull request #4099 from VOREStation/upstream-merge-5450 
[MIRROR] Fixed mining cloak not being in loadouts
 2018-09-01 17:31:06 -04:00
Anewbe
4fc94a6e47 Ports descriptors from Bay 2018-08-19 22:32:44 -05:00
Spades
6f35a33e1c Merge pull request #4068 from VOREStation/upstream-merge-5429 
[MIRROR] Adds Marking Order Changing at Character Creation
 2018-08-17 16:07:33 -04:00
deathride58
87859c77af adds a pref to enable/disable showing up in the character directory 2018-08-15 06:18:58 -04:00
Anewbe
e1471886d8 Fixes the bug(s) that allow meat bodies to have metal brains 2018-08-14 23:12:43 -05:00
kcin2001
187fc62e9c Adds new job/department specific teshari clothing to the loadout (#5481) 
* adding the new department specific teshari outfits
 2018-08-09 19:43:40 -07:00
Atermonera
7b631c19f1 Merge pull request #5457 from PrismaticGynoid/colorblindnessforall 
Lets people be colorblind
 2018-08-01 09:01:27 -07:00
PrismaticGynoid
31e5769ff6 Whoops, worded that wrong 2018-07-30 22:08:31 -07:00
PrismaticGynoid
1a16d84bb5 Lets people be colorblind 
Adds four types of colorblindness to the traits in the setup menu - protanopia, deuteranopia, tritanopia, and monochromacy. Previously, there were ones defined in the code, but not actually usable to players.
 2018-07-30 21:33:16 -07:00
Atermonera
966261c6d9 Merge pull request #5450 from Heroman3003/mining-cloak-fix 
Fixed mining cloak not being in loadouts
 2018-07-29 02:55:02 -04:00
Heroman3003
8d1ae5795b fixed mining cloak not being in loadouts 2018-07-28 09:13:43 +10:00
Cameron653
5fc76df183 Merge branch 'master' into ALRAUNE_STUFF 2018-07-23 20:08:30 -04:00
KasparoVv
1f236a1d2e Adds Marking Order Changing at Character Creation (#5429) 
* Adds Changing Order of Markings

Clicking the back button on a marking will trade its place with the previous marking or move it to the end of the list if it's the first marking.

Clicking the forward button on a marking will trade its place with the next marking or put it in first before all other markings if it's last in the list.

* Changelog

Adds changelog.

* Buttons Only for >1 Marking

Only renders the layer-swap buttons when there is more than one body marking.

* Changes Button Labels to Proper Up/Down Arrows

Thanks Atermonera!
 2018-07-22 21:35:22 -04:00
KasparoVv
d59612028e Adds Marking Order Changing at Character Creation (#5429) 
* Adds Changing Order of Markings

Clicking the back button on a marking will trade its place with the previous marking or move it to the end of the list if it's the first marking.

Clicking the forward button on a marking will trade its place with the next marking or put it in first before all other markings if it's last in the list.

* Changelog

Adds changelog.

* Buttons Only for >1 Marking

Only renders the layer-swap buttons when there is more than one body marking.

* Changes Button Labels to Proper Up/Down Arrows

Thanks Atermonera!
 2018-07-22 18:34:52 -07:00
Aronai Sieyes
78112a432c Merge pull request #4052 from VOREStation/upstream-merge-5417 
[MIRROR] Gender name adjustments
 2018-07-21 15:52:01 -04:00
Aronai Sieyes
878b195dbb Merge pull request #4030 from VOREStation/upstream-merge-5402 
[MIRROR] Language and Larynx Additions
 2018-07-21 14:43:47 -04:00
Arokha Sieyes
adbb5b86a5 Fix merge conflicts 2018-07-21 11:34:54 -04:00
Anewbe
f327f32255 Merge pull request #5417 from kartagrafi/patch-1 
Gender name adjustments
 2018-07-17 22:15:06 -04:00
kartagrafi
a4b3745e4b Gender name adjustments 
for the sake of accuracy and making sense, this changes "gender identity" to "pronouns", and "biological gender" to "biological sex". could also just change it to "sex", but i feel like "biological sex" is clearer for the uninitiated.
i don't know shit so if there's anything broken in here, please lmk, though it's just names so there shouldn't be a problem
 2018-07-16 22:37:02 +02:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Anewbe
8f9e817bf0 Language and Larynx Additions (#5402) 
* Various Language Improvements
 2018-07-13 21:13:47 -07:00
Anewbe
5fff00c4d5 Adds an option to enable/disable markings on synth parts. 2018-07-08 17:36:41 -04:00
Verkister
3b3a4ae19f Adds an option to enable/disable markings on synth parts. 
-In char setup near the synth color option.
-Tested working although the preview icon may misbehave with the icon cache. (Meaning the effect will require refreshing the cached icon with a visual change, such as color, markings, limb status change, etc. to show up, and may not show up at all if the appearance is identical to an earlier one already saved to cache and getting loaded from there instead of refreshing.)
 2018-07-07 10:46:18 +03:00
Anewbe
0c25bf04a0 Merge pull request #5375 from Mewchild/MC-Cloaks 
Adds non-head of staff department cloaks
 2018-07-02 20:32:14 -04:00
Mewchild
a8600832d8 Adds non-head of staff department cloaks 2018-06-27 10:24:31 -05:00
Cameron653
7028511d64 Prevents sanitization of custom icon base. Removes a custom fluff item since Alraune are now in. 2018-06-17 20:00:10 -04:00
Cameron653
864c4ca106 Gives Alraune the ability to select body shape. Gives Alraune the ability to select a fruit/vegetable to grow via an implant. Some code cleanup relating to custom body shape selection. Makes species name their defines instead of "name" Fixes a typo in custom_items where the reagent generator being selected was roiz instead of pumila. 2018-06-15 16:41:59 -04:00
Arokha Sieyes
c60738b330 Enforce minimum age limit across all characters 
Synths could be any age.
 2018-06-12 20:14:03 -04:00
Novacat
5addac95ed Pathfinder Update (#3777) 
* Pathfinder Update

- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker

* Polaris Merge Compatability

* Forgot some things

* Moves PF from command to science

* Requested changes Part 1

* Travis and Access Fix

* Requested changes Part 2

* Resetting Maps Part 1

* Resetting Maps Part 2

* Replaces PF office airlock

* Requested Changes Part 3

* Remove gateway access

* Changes Locker/Door Access Req

* Removes blast doors

* Pilot voidsuit crate cost tweak
 2018-05-31 16:57:40 -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
Mewchild
c82d29cf81 Gives KHI CMD to all command staff 2018-05-23 16:58:10 -05:00
Lorwp
d6403126d5 Adds SAR to allowed_roles of certain loadout items 2018-05-17 21:18:49 +10:00