cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,642 Commits 5 Branches 0 Tags
4ce40dad53730f9176b51c0bb92b3e0bc06e14dc
Commit Graph

1249 Commits

Author SHA1 Message Date
radar651
3a245943d3 MedHUD Patch 
Medical hud patch. Arrr.
 2020-05-12 10:29:29 -04:00
Atermonera
d6e369178b Merge pull request #7128 from KillianKirilenko/kk-fashion2 
[PORT] Military Jackets
 2020-05-11 20:01:59 -04:00
Aronai Sieyes
3d30288a5e Round hours shown on occupations page 2020-05-11 17:56:04 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
b98f849c82 Merge pull request #7723 from VOREStation/aro-playtimedept 
Add department playtime requirement config, code
 2020-05-10 19:00:38 -04:00
Unknown
a74d890331 Repurposes Explorer Corp Uniforms 
Repurposes the SEV Torch Explorer Corp uniforms into uniforms for the Nanotrasen Defense Force.
 2020-05-10 14:44:15 -04:00
Novacat
1d9879c7a0 Merge pull request #7734 from KillianKirilenko/kk-misc 
[LOADOUT] Dept. AR Glasses
 2020-05-10 12:42:35 -04:00
Killian
f18191da1e Update loadout_eyes_vr.dm 2020-05-09 17:33:38 +01:00
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -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
SplinterGP
17df0f666f Merge branch 'master' into master 2020-05-05 21:02:46 -03:00
SplinterGP
6b1cb4e1ff Adds haemophilia too and reset button 2020-05-05 20:53:41 -03:00
SplinterGP
3ad4e4a535 Disabilities out of trait system 2020-05-05 15:46:30 -03:00
Aronai Sieyes
01a51e5acd Add prefs for Be Morph, Be Maintpred, Be Lost Drone 
Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again.
 2020-05-04 20:04:43 -04:00
Aronai Sieyes
538e85283b Fix out-of-order role candidate options 
fixup pol commit
 2020-05-04 20:04:43 -04:00
Killian
8240a97400 Merge branch 'master' into kk-miscstuff 2020-05-04 14:20:02 +01:00
Steven Storesund
868d412d19 Aurora's floof, I mean fluff item 2020-05-03 19:44:13 -05:00
SplinterGP
d014595b73 Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-04-30 21:49:16 -03:00
SplinterGP
a100713305 Puts some extra on name so sec officers can know it is job-related 2020-04-30 21:27:16 -03:00
serenekerosene
b693f8e06c Scylla Fluff Item 
I hope I did this right!!!!!!!! TY to Amaya for the guide

Fluff application was approved here: https://forum.vore-station.net/viewtopic.php?f=26&t=1744
 2020-04-30 20:24:25 -04:00
SplinterGP
0b5c897eb8 adds YW edit 2020-04-30 20:24:42 -03:00
Novacat
81900f5080 Merge pull request #7505 from AmayaWah/pleasestop 
Adds Damon's bomber security jacket.
 2020-04-29 18:45:51 -04:00
TheFurryFeline
3afe4adaed Remove Duplicate Code 
Title, response to mirror.
 2020-04-29 15:17:05 -04:00
Greenjoe12345
ff628daae1 Adds heterochromia for humanoid species and Teshari (#7016) 
adds the ability to color the Teshari undercoat, cloak, smock, as well as the footwraps
 2020-04-29 15:11:41 -04:00
Amaya
c04d919051 *scream 2020-04-29 17:02:12 +02:00
Killian
c0a8fc67db small loadout tweaks 2020-04-28 07:00:31 +01:00
Aronai Sieyes
f2e6280161 Merge pull request #7479 from VOREStation/SERDYKOVKITFIX 
Allows Serdy's modkit to be selected.
 2020-04-27 10:57:33 -04:00
Aronai Sieyes
45b67c5948 Merge pull request #7321 from KillianKirilenko/kk-collar 
Colorable Collar/Choker Accessory
 2020-04-27 10:56:08 -04:00
Cameron653
9eaea818b7 Allows Serdy's modkit to be selected. 2020-04-27 10:43:38 -04:00
Cameron653
1e29d2a734 Fixes & Changes Silencedmp5a5's fluff items. 2020-04-26 13:59:58 -04:00
Atermonera
885c404bff Merge pull request #7014 from KasparoVy/clothe_the_teshari 
Adds Colorable Apron & Tesh Labcoat
 2020-04-25 15:39:54 -04:00
Aronai Sieyes
0b79828ec9 Forbid and sanitize out hyphen as language prefix 2020-04-25 13:03:47 -04:00
Atermonera
0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Novacat
119d7736d4 Merge pull request #7314 from VOREStation/aro-whisubtle 
Adjust ghosts hearing whispers/subtles
 2020-04-19 23:44:19 -04:00
Aronai Sieyes
209eb0e017 Port some random clothes 2020-04-18 19:41:54 -04:00
Killian
d5e344f178 colorable collar accessory 2020-04-18 18:18:37 +01:00
Aronai Sieyes
f7609c6aff Makes it a preference 2020-04-17 17:44:05 -04:00
Killian
35dedb85e8 Merge branch 'master' into kk-miscstuff 2020-04-17 19:56:51 +01:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Novacat
13353294f2 Merge pull request #7239 from Heroman3003/headband-maid 
Adds maid headband to loadout
 2020-04-13 18:04:29 -04:00
Heroman
fa5422cc63 Adds a comment for future 2020-04-14 07:27:44 +10:00
Heroman
87a65a09c6 Fixes Azura's collar 2020-04-14 07:16:31 +10:00
Heroman
2073af57f1 Adds maid headband to loadout 2020-04-14 06:48:18 +10:00
Aronai Sieyes
9368dd2736 Talon job pref saving 2020-04-13 11:05:27 -04:00
MrSign
0da3c94d09 Update loadout_fluffitems_vr.dm 2020-04-13 13:14:19 +10:00
Atermonera
83c1a512e2 Adds pref to toggle vchat without 60s wait for linux users (#6980) 2020-04-12 00:51:57 -04:00
CRTXBacon
c78ffd954e Add files via upload 2020-04-12 02:04:18 +01:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00