cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-08 16:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 8 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

1187 Commits

Author SHA1 Message Date
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
Unknown
34d695c301 Disables rosettes temporarily 2019-04-05 20:48:12 -04:00
Unknown
8b7ae56e83 Last Minute Fixes 
- Fixes Virgo species being able to wear hardsuits.
- Adds new rosette markings and sprites
- Adds new status display icon for code yellow
 2019-04-05 20:08:06 -04:00
Unknown
a475400b92 Adds Tentaclehead/mouth sprites 
...This was easy to fix? I wonder why the author never fixed it...
 2019-04-03 15:11:06 -04:00
Unknown
ec78c7b13b Adds Tajhair to Xenochim/Proteans 2019-03-29 09:39:30 -04:00
Unknown
59b2681800 Fixes Character Setup 2019-03-29 08:22:10 -04:00
Novacat
f62c6f2194 Merge pull request #4785 from VOREStation/upstream-merge-5962 
[MIRROR] Prevents people from joining with the same character
 2019-03-28 21:07:32 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat
d2cd4ff7b5 Merge pull request #4718 from VOREStation/upstream-merge-5893 
[MIRROR] Additional Hair
 2019-03-27 21:19:42 -04:00
Anewbe
0e75d3ad8b Merge pull request #5799 from Neerti/character_preview_fix 
Fixes Character Preview
 2019-03-27 04:27:15 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Unknown
9a5065a77f Forgot Vorestation Edit 2019-02-25 09:23:17 -05:00
Unknown
d9ad515056 [5962] Adjustments to PR 4785 
- QTR no longer blacklists the character from rejoining.
- Modified notifications to encourage QTR use
 2019-02-25 09:13:32 -05:00
Anewbe
ceb2c7112e Merge pull request #5962 from GeneriedJenelle/patch-1 
Prevents people from joining with the same character
 2019-02-18 15:13:15 -05:00
Atermonera
0a98bac8f3 Merge pull request #5893 from Woodratt/01212019_Hair 
Additional Hair
 2019-01-26 03:53:51 -05:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00
Atermonera
3fb5d15c43 Merge pull request #5718 from kartagrafi/hairunderwearwhatever 
New hair + underwear
 2018-12-01 00:17:11 -05:00
Hawk_v3
10ca5bb70f Merge remote-tracking branch 'upstream/master' 2018-10-14 17:09:41 +01:00
kcin2001
fb4fcf1e18 fixes copy paste error 2018-10-08 11:58:01 -07:00
Hawk_v3
c931ceaa1f Merge remote-tracking branch 'upstream/master' 2018-10-07 23:07:09 +01:00
Kates
06f01d9e58 Update new_player.dm 2018-10-06 03:27:58 +02:00
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01:00
lbnesquik
fdd5d10b54 Fix misleading alert. 2018-10-03 18:36:39 +02:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018 
Polaris Sync 09-27-2018
 2018-10-01 08:43:03 -04:00
Spades
e37ac96b25 Merge pull request #4176 from iskawhiskers/master 
Add "monster mouth" and "blank round face" sprites to body markings
 2018-09-27 19:36:22 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	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-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Anewbe
b109cfae42 Helmets now show only certain hairstyles 2018-09-05 19:43:24 -05:00
Hawk_v3
317039b60e Merge remote-tracking branch 'upstream/master' 2018-08-21 21:01:43 +01:00
iskawhiskers
2660905873 Add "monster mouth" and blank round face to fit it 2018-08-18 02:56:05 -03:00
tex
6f0dbfc750 Added new hairstyles 2018-08-05 20:55:19 +02:00
Verkister
74d0bd8763 Couple clown tweaks. 
-Allows our responsible whitelist clowns spawn with the bikehorn.
-Disables the destructive forced name randomization and lossy rename BS on join.
 2018-07-25 10:54:59 +03:00
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -04:00
Cyantime
53bbf6a3ec Spawns off an alert in character setup. 2018-07-12 04:21:03 +00:00
Anewbe
c84447047c Merge pull request #5395 from elgeonmb/sabsthing 
Adds four new tatoos
 2018-07-08 17:37:55 -04:00
elgeonmb
36982f775a Sabess wanted me to add these tattoos so I did 2018-07-07 02:44:17 -07:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Verkister
82dd96a141 Adds a bunch of new sprite accessories. 
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
 2018-06-29 15:32:30 +03: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
Atermonera
7cd1442e8f Ports some Bay hair code 2018-06-12 03:43:57 -04:00
Repede
f772d7622c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-06-10 21:19:07 -04:00
Repede
8cc1047023 Lots of new markings and stuff 2018-06-08 21:24:32 -04:00
Anewbe
17a295b579 Ports some Bay hair code 2018-06-06 20:20:23 -05:00
Repede
90ce7b203a compile fix 2018-06-06 20:29:26 -04:00
Repede
c0ea30d5ba Readded fatty taurs, 
Added Harpsongs new centtaur sprite
 2018-06-06 19:52:48 -04:00
Anewbe
d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2 
Changes "Setup Character" to "Character Setup"
 2018-06-04 16:08:13 -04:00
Cameron653
b8008e454b Changes Setup Character" to "Character Setup" 
Since that's what is used everywhere else.
 2018-06-03 15:32:42 -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
Anewbe
25a6fb865a Merge pull request #5313 from VOREStation/pol-joblogmove 
Move character join log statement
 2018-05-31 21:33:31 -04:00
Arokha Sieyes
fb9bfd8639 Move character join log statement 
Was only logging latejoins due to where this line was placed. Moved it into job controller to catch any time anyone is assigned a job period.
 2018-05-29 14:26:23 -04:00
Unknown
c02a0973ff Adds Heterochromia Markings 
Supports most species, with exception of Teshari, Skrell, and Vox.
 2018-05-27 18:40:04 -04:00