cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 8 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

1430 Commits

Author SHA1 Message Date
Spades
0a0a414870 Merge pull request #5375 from Heroman3003/scaling-fix 
Fixes icon scaling on later byond versions
 2019-07-05 07:03:30 -04:00
Novacat
d32641e940 Merge pull request #5367 from Novacat/nova-basicfixes 
Enables Language Implants
 2019-07-04 21:08:10 -04:00
Heroman
2c11586f7d Fixes some personal fluff items being selectable in loadout 2019-07-05 09:58:27 +10:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Heroman
3789ab51b7 Fixes icon scaling on later byond versions 2019-06-26 15:45:43 +10:00
Unknown
9b4ad70da6 Enables Language Implants 
On request from Dragor.

Removes the VOREStation edits commenting out EAL/Skrellian language implants.
 2019-06-24 21:39:23 -04:00
TheFurryFeline
d94e166347 Indigestible Collar 
Adds a new loadout item, a variation of the holo-collar with the intention of surviving digestion of its wearer. Approved, pretty much, from https://forum.vore-station.net/viewtopic.php?f=26&t=1531&sid=d3664ec3c397cebbf9a62e2e18fbb6f6
 2019-06-17 11:43:56 -04:00
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Unknown
d13e8ee784 Critical Fixes 
- Fixes HREF Exploit
- Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
- Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
- Fixes #5272
 2019-05-26 23:58:56 -04:00
Hawk_v3
3aa4e406f9 Merge remote-tracking branch 'upstream/master' 2019-05-15 14:46:50 +01:00
Heroman3003
6f80f45eed Ports character setup subsystem 2019-05-14 11:48:34 +10:00
Hawk_v3
9b0186a2c1 Merge remote-tracking branch 'upstream/master' 2019-05-09 23:11:58 +01:00
Novacat
8dd3039217 Update loadout_utility.dm 2019-05-09 13:43:15 -04:00
Atermonera
445923d699 Fixes bug with custom laptops/tablets 2019-05-09 13:05:54 -04:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Heroman
ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
Novacat
797f9dee59 Merge pull request #5115 from InterroLouis/Webbing-Cost 
Changes Webbing Cost
 2019-04-28 22:57:41 -04:00
Novacat
fb52ec08c6 Merge pull request #5114 from Novacat/nova-weapons 
Expedition Sub-department
 2019-04-28 22:57:13 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Unknown
62295136f3 Changes Engineering to LHS 2019-04-25 20:09:09 -04:00
Unknown
729b1fc662 Changes off Duty ID Aesthetics 2019-04-25 19:56:47 -04:00
InterroLouis
7d63917579 Update loadout_accessories_vr.dm 2019-04-21 17:28:22 -04:00
Unknown
afc0d67f21 [WIP] Expedition Sub-department 
- Moves explorer job roles from their respective departments into an Exploration sub-department
- CHAIN OF COMMAND WILL REMAIN UNCHANGED
- ACCESS WILL REMAIN UNCHANGED
Note: Pathfinder's minimum access is getting tweaked, in case minimum access ever gets used.

This is a purely clerical change that is being done for two reasons.
1: To enable off duty exploration role, important for the upcoming timeclock PR. The upcoming timeclock functionality will cause difficulties for expedition roles, due to, at present, being in a wide variety of different departments.
2: Generally, explorer roles in other departments tended to create confusion, as people would ask (or even demand) those roles to do station-side duties, even if their access (or lack thereof) made it impossible.
 2019-04-21 17:05:58 -04:00
InterroLouis
4fe127b83a Update loadout_accessories_vr.dm 2019-04-21 15:47:01 -04:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Jonathon Key
346725f28b Adds a colorable cloak in loadout (#6040) 2019-04-13 17:38:00 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman3003
e0e9158739 Loadout adjustments for access and swimsuits 2019-04-08 10:19:21 +10:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
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
db710b61f1 Merge pull request #4842 from VOREStation/upstream-merge-5988 
[MIRROR] Copy character slots
 2019-03-28 22:00:38 -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
3129c2a85b Update preferences.dm 2019-03-28 21:34:11 -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
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -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
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -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
1bbb64494e Merge pull request #4678 from VOREStation/upstream-merge-5835 
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
 2019-03-27 15:19:15 -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