cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,059 Commits 7 Branches 0 Tags
0151c0ad23b51a65bb3013d233d29026a022adc2
Commit Graph

111 Commits

Author SHA1 Message Date
Aronai Sieyes
b5038715f8 Merge pull request #11242 from VOREStation/upstream-merge-8183 
[MIRROR] Fixes blank ID sprite for HoP/Secretary
 2021-07-25 18:17:32 +00:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Nadyr
c21ee657fe Merge pull request #2385 from CHOMPStationBot/upstream-merge-10794 
[MIRROR] Port various backpacks
 2021-07-03 21:40:25 -04:00
Chompstation Bot
e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz
ffe017bf01 Give medical doctors on spawn an advanced medkit instead of regular 2021-07-03 00:19:51 -07:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04:00
Aronai Sieyes
e89052c292 Merge pull request #10505 from VOREStation/Arokha/miscfix 
Some misc runtime fixes
 2021-05-31 03:57:35 +00:00
Chompstation Bot
e26ff2e5cb Miscellaneous Sundries 2021-04-11 17:54:34 +00:00
Nadyr
dfa0bd9b0f Update special_vr.dm 2021-03-26 04:09:00 -04:00
Chompstation Bot
abc800056c [MIRROR] New ID Card Design 2021-03-23 16:15:59 +00:00
Novacat
98ef088fa6 Merge pull request #9986 from Meghan-Rossi/pilot_harness 
Pilots get their harness even with loadout uniform
 2021-03-21 21:53:15 +00:00
Novacat
d2b2342d74 Merge pull request #9965 from VOREStation/upstream-merge-7983 
[MIRROR] Fixes pilots not getting a harness if they use a loadout uniform
 2021-03-18 14:40:40 +00:00
Novacat
645c134eb3 Merge pull request #9906 from Little-119/weird-helmet-begone 
Remove weird helmet thing from Forensic Technician outfit
 2021-03-11 22:21:31 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
ShadowLarkens
951f37d2e3 TGUI Engineering: Squashed Edition (Commits Below) 
TGUI APCs

 TGUI vending machines

 Fix AI default_tgui_interaction

 TGUI Airlocks

 Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes

 TGUI Air Alarms & Central Atmospheric Control

 Airlock TGUI

 TG... got rid of UI for fire alarm. í´·

 TGUI Gas Heating/Cooling System

 TGUI Gas Pump & Passive Gate + Fixes

 TGUI Omni Atmospherics

 TGUI Pipe Dispensers & RPD

 TGUI IntelliCore & Vending Fix

 TGUI Handheld Tanks

 TGUI Portable Pump & Scrubber

 TGUI Tank Dispenser & Canisters

 TGUI Radios

 TGUI SMES & Air Alarm adjustment

 Tweak vending machine interfaces a tad

 TGUI Algae Farm

 TGUI general_air_control

 - Distro & Waste Console
 - Riot Control Console
 - Atmos Intake Console
 - Engine Cooling Console

 TGUI Heavy Scrubber Control (and body scanner fix)

 TGUI trinary devices & shutoff monitor

 TGUI Telecomms Log Browser

 TGUI Telecomms Machine Browser

 TGUI Spaceheater Internal Panel

 TGUI Gravity Generator

 TGUI Id Cards & Fix ID Card Images

 TGUI Id Card Redesign

 TGUI Turbolift

 TGUI Suit Cycler & Suit Storage Unit & Vending Fixes

 TGUI Power Monitor

 TGUI Signalers

 TGUI Employment Records

 TGUI Drone Console

 TGUI RIGSuits

 TGUI PA & PACMAN, and Margin Fix

 TGUI Solar Panels & Fix Power Monitor

 Adjust TGUI modules & their interaction with NTOS

 TGUI RCON

 TGUI Message Monitor

 Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002)

 TGUI Exonet & NTNet Relay

 TGUI Telecomms Multitool Menu

 TGUI Shield Capacitor & Shield Generator

 TGUI Supermatter-everything & Refactors
 2020-08-09 04:46:31 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Razgriz
916752d711 Update security.dm 2020-08-07 01:05:17 -07:00
Razgriz
8d93a32fbb Default forensics gloves for detective 2020-08-06 22:09:18 -07:00
Razgriz
c734a5798b Forensics gloves for detective 2020-08-06 21:13:08 -07:00
izac112
0f05106e95 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-15 12:27:54 +02:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Unknown
8d170c8468 Removes Exploration Weapon Permits 2020-06-02 19:35:36 -04:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Unknown
a313950f62 Fixes compile 2020-05-28 14:22:46 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
Novacat
872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Aronai Sieyes
a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Unknown
a78c597ed8 Fixes PF Loadout 2020-04-30 12:08:01 -04:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -04:00
Unknown
a9812e82aa Some tweaks! 2020-04-27 13:49:11 -04:00
Unknown
9dec57c97f Splits off Exploration and Science 
- Removes all Science access from explorers
- Removes Gateway access from HoS and RD
- Removes Science comms from explorer headsets
- Adds Command comms to Pathfinder headset
- Refactors edited Southern Cross files into _vr files in the main code.
- Moves Exploration Equipment Vendor to the expedition shuttle.
- Moves the Chemical Analyzer in science to Exploration Prep
- Removes general science access from the Xenobiology office and equipment rooms
- Removes RD access to Explorer comms
- Adds Airlock and EVA access to explorers
- Increases number of pilot slots by 2

SOP notes:
- Pathfinder will be able to fire subordinates.
- Pathfinder will not be a full head.
- Field Medic will remain as a hybrid Medical/Explo role.
- Research Directors will no longer be exempted from the general rule that heads of staff should not attend expeditions.
- Exploration is still strongly encouraged to get volunteers from other departments, including Science.
 2020-04-25 20:36:21 -04:00
Repede
517d74928b Merge branch 'master' into kk-miscstuff 2020-04-10 16:59:07 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Killian
8b9f5e949a security pilot basics 2020-03-17 15:11:28 +00:00
Novacat
ddf28fad89 Update civilian.dm 2020-03-11 17:51:33 -04:00
Atermonera
fa8c9fabab Job description alt 2020-03-11 15:55:05 -04:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Aronai Sieyes
2a53830fa7 Add alternative detective wear 2020-02-21 13:46:49 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Cebutris
9bde77ed63 ringtone >> ttone 2020-01-23 18:44:00 -05:00
Cebutris
70fa53cb2c beep 2020-01-22 02:59:41 -05:00
Heroman
181331d166 Earlyports fix for barista missing access 2020-01-15 04:48:41 +10:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
f59e2811e3 Merge branch 'upstream-merge-6520' into prybars 2019-12-19 18:47:49 +00:00