cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-06 06:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,903 Commits 10 Branches 0 Tags
fcc2f9aa79d45901f556448b83cd2fc67f2b1366
Commit Graph

1260 Commits

Author SHA1 Message Date
Repede
ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
 2018-08-17 19:13:15 -04:00
Spades
69c0cd8b8c Merge pull request #3983 from Verkister/synthmarking 
Couple VS compatibility tweaks on the synthlimb markings option.
 2018-08-17 16:09:56 -04: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
Verkister
85a7c2d7d4 snip 2018-08-14 09:16:42 +03:00
Verkister
6cb51f741a Merge branch 'master' into synthmarking 2018-08-14 09:09:14 +03: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
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
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Anewbe
5fff00c4d5 Adds an option to enable/disable markings on synth parts. 2018-07-08 17:36:41 -04:00
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
 2018-07-08 11:38:06 -04:00
Verkister
91f250af3b Adds an option to disable markings on synth limbs. 
-You can now have clean robolimbs on your artfully painted organic bodies again.
-In char setup near the synth color option.
-Tested working although it requires a physical change (colors, markings, limb status, etc.) to refresh the body cache before it can show up in preview.
 2018-07-05 14:31:29 +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
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04: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
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -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
Anewbe
418af6376d Merge pull request #5272 from Lorwp/SARloadout 
Adds SAR to allowed_roles of certain loadout items
 2018-05-23 23:38:33 -05:00
Mewchild
c82d29cf81 Gives KHI CMD to all command staff 2018-05-23 16:58:10 -05:00
Repede
7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-05-23 00:13:07 -04:00
Arokha Sieyes
6b4be2d7a8 Paranoid logging and byond account age 
Adds the PARANOIA_LOGGING setting to config.txt (and PANIC_BUNKER which was missing for some reason) and updates example.

PARANOIA_LOGGING (also available as a verb for admins in Server) begins notifying admins of any 0day byond accounts, or users who have never joined before. For when you don't quite want to panic bunker.

Also makes this information available in player panel. Requires SQL connection.
 2018-05-22 23:03:53 -04:00
Lorwp
d6403126d5 Adds SAR to allowed_roles of certain loadout items 2018-05-17 21:18:49 +10:00
PrismaticGynoid
eabfa03891 Laser pointers (#5257) 
* Laser pointers

Adds laser pointers, ported from tg/oldaurora (but heavily modified). They can be found in the loadout, as well as made by science. Science can also upgrade them, which makes them occasionally useful for blinding people, too.

The bugfixes which make several of the features work properly will come in a separate commit.

* Three fixes

Cats now have resting sprites for all 4 directions, instead of just east. This was needed to make cats look like they're pouncing on the laser dot.

Cameras can now be EMPed more than once, and EMPs actually are able to disable them now. This was needed for the shining lasers into cameras feature.

Flash_eyes() now actually displays a flashing animation on your screen when you get flashed (except for silicons, who for some reason are excluded from this unless EMPed). This was needed for laser pointers to have a temporary "blinding" effect when shone into someone's eyes.

(removes errant debug message too, whoops)

* Nerf

Reduced chances of laser pointers doing anything useful on silicons.

Also, fixes a duplicated proc, oops.

* Requested changes

Minor changes as requested - 'cell' to 'diode', view() to viewers(), range() to viewers().

Stops buckled or dead cats from reacting to laser pointers. Zombie cats are fun, but no.

Also, does another small nerf to the effects on silicons.
 2018-05-14 15:22:19 -07:00
Aronai Sieyes
59a852ae45 Merge pull request #3661 from VOREStation/aro-ssao-vs 
Ports 'fake' SSAO from /tg/ as a preference
 2018-05-13 23:33:02 -04:00
Aronai Sieyes
ba6a2b5641 Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01 
Polaris Sync 2018-05-01
 2018-05-13 23:20:18 -04:00
Repede
9e69f25327 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
 2018-05-13 21:08:22 -04:00
Neerti
7b73336244 Merge pull request #5261 from VOREStation/aro-ssao 
Ports 'fake' SSAO from /tg/ as a preference
 2018-05-13 17:20:28 -04:00
Aronai Sieyes
fd04336d89 Merge pull request #3655 from VOREStation/aro-fps 
Adds a client FPS setting
 2018-05-10 15:46:29 -04:00
Leshana
33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
 2018-05-10 13:48:20 -04:00
Arokha Sieyes
f746821964 Ports 'fake' SSAO from /tg/ as a preference 
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
 2018-05-09 14:51:07 -04:00
Arokha Sieyes
634527aa5b Ports 'fake' SSAO from /tg/ as a preference 
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
 2018-05-09 14:49:00 -04:00
Arokha Sieyes
8f876de645 Adds a client FPS setting 2018-05-07 23:37:47 -04:00
Arokha Sieyes
fe5633e3d8 Adds a client FPS setting 2018-05-07 23:36:47 -04:00
Leshana
86eac9c0b1 Implement rust-g library 2018-05-04 18:58:31 -04:00
Repede
372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs
 2018-04-27 21:45:13 -04:00
Mewchild
78efe65c1c Fixes miners not being able to take supply snowsuit 2018-04-27 12:12:24 -05:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	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-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
Atermonera
1fc11fe8c5 Merge pull request #5187 from Anewbe/comms_tweak 
Communicator visibility is now on a per-character basis, rather than global
 2018-04-23 18:59:00 -07:00
Leshana
8ac6b0bfe9 Fix Scree and Scree Accessories 2018-04-21 23:22:08 -04:00
Anewbe
5cfb443cce Communicator visibility is now on a per-character basis, rather than global 2018-04-21 17:08:39 -05:00
elgeonmb
c12368b887 Adds new robot codex (#5178) 
* adds new robot codex

* appeases ater
 2018-04-20 10:30:06 -07:00
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-04-20 09:03:58 -04:00
Arokha Sieyes
2cba96cf4c Switch to defines for custom species stuff 2018-04-19 19:34:10 -04:00
Arokha Sieyes
1a349f77dd Cleans up custom species icon base code 
Fixes #3478
 2018-04-19 17:46:51 -04:00