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
49,961 Commits 8 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

1396 Commits

Author SHA1 Message Date
Atermonera
445923d699 Fixes bug with custom laptops/tablets 2019-05-09 13:05:54 -04: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
Heroman
b17718ea6c Implements selection of whitelisted species 2019-04-28 17:45:44 +10: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
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
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
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -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
Neerti
e2557228dc Copy character slots 2019-03-08 20:17:46 -05: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