cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 04:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,260 Commits 8 Branches 0 Tags
d740295aabb1d008fe91a9c28c235d44b5110f4d
Commit Graph

1007 Commits

Author SHA1 Message Date
Steven Storesund
868d412d19 Aurora's floof, I mean fluff item 2020-05-03 19:44:13 -05:00
serenekerosene
9394d6561b Update custom_items_vr.dm 2020-04-30 21:39:26 -04: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
Aronai Sieyes
351b3522bd Merge pull request #7534 from VOREStation/aro-moverework 
Rewrite client/Move() for smoother movement ingame
 2020-04-30 18:03:52 -04:00
Aronai Sieyes
1688e16d88 VS: Get your clicks out of my movement code 2020-04-30 15:41:26 -04:00
H0lySquirr3l
6691339d04 Add files via upload 2020-04-30 09:03:26 -05: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
Amaya
165931c96a aaaaaaaa 2020-04-29 17:10:07 +02:00
Amaya
c04d919051 *scream 2020-04-29 17:02:12 +02:00
C.L
3fc0f548f4 Well that was embarrasing 
Got rid of "desc =" from the description.
 2020-04-26 14:11:35 -04:00
Cameron653
1e29d2a734 Fixes & Changes Silencedmp5a5's fluff items. 2020-04-26 13:59:58 -04:00
Aronai Sieyes
efa4f6ca67 Merge pull request #7109 from KillianKirilenko/kk-convkit 
Conversion Kit Overhaul
 2020-04-19 23:12:32 -04: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
Aronai Sieyes
074116fa7c Merge pull request #7212 from Novacat/nova-pathfinder 
Gun Refactors and Changes
 2020-04-13 09:45:37 -04:00
CRTXBacon
b1dde97d98 Add files via upload 2020-04-12 02:05:14 +01:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Unknown
323d5f838b Gun Refactors and Changes 
- The Protector is now a minature energy gun, it has 3 lethal, 6 standard stun, and no special stun shot anymore. It retains the alert level lock, there is a version without the lock.
- The energy net gun now gets 3 net shots, but loses its stun alternate fire. It also gets a new sprite from baystation.
- Refactors all Vorestation weapons in vore/fluffstuff to be in their appropriate directories.
- Removes all personalized custom weapons.
- KHI is no longer the manufacturer for the Protector, Net Gun, and AR Glasses. I wanted to make KHI a bit rarer, and their specialty mainly ultra high tech equipment.
- Refactors Expedition Phasers. No practical change, but now there are unlocked versions of all three phaser variants.
 2020-04-11 19:39:49 -04:00
Killian
65ca7b651b forgot to change the var on the debug/test kit 2020-04-10 16:11:13 +01:00
Killian
3d2f5337b8 Update custom_items_vr.dm 2020-04-10 16:06:44 +01:00
Razgriz
606a1b2865 Axis rename 2020-04-09 14:36:02 -07:00
Razgriz
3334c9bdd6 Axis rename 2020-04-09 14:34:15 -07:00
Razgriz
f6279a9f1a Axis rename 2020-04-09 13:56:46 -07:00
Razgriz
fcec2196fd Axis rename 2020-04-09 13:56:27 -07:00
Razgriz
934d2e95e4 Delete nazirus_yw.dm 2020-04-09 13:56:02 -07:00
Razgriz
3baaa4ecf4 Axis rename 2020-04-09 13:55:33 -07:00
Killian
533dfe61bb WIP upgrade with proper casting 2020-04-09 21:38:33 +01:00
Repede
4618664eca Merge branch 'master' into kk-convkit 2020-04-05 14:05:47 -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
fd61ada76e conversion kit overhaul 2020-04-02 21:21:47 +01:00
Killian
6f20851b86 Update custom_items_vr.dm 2020-04-02 06:38:15 +01:00
Killian
1726b93739 messy update to kit logic 2020-04-02 03:51:09 +01:00
Killian
e2b32a1c15 update transfer behaviour, nonintrusive adjustments to gun spawning 2020-04-02 02:39:51 +01:00
Killian
65f36adbf1 Update custom_items_vr.dm 2020-04-02 02:05:41 +01:00
Killian
956781da4a Merge branch 'kk-convkit' of https://github.com/KillianKirilenko/YWPolarisVore into kk-convkit 2020-04-02 01:52:52 +01:00
Killian
01498d023e modkit forensics and new checks 2020-04-02 01:52:08 +01:00
Killian
b9804bb8e7 update moca's kit key 
Co-Authored-By: Izac Joof Forsgren <izac10@live.com>
 2020-04-01 22:30:47 +01:00
Killian
7732f38d2c conversion kit sanity checks 2020-04-01 13:44:57 +01:00
Killian
97cd4f349f conversion kit rejigger 2020-04-01 05:36:39 +01:00
SplinterGP
9dd21ddbae Aroozee valhollide ring 
Fluff item
 2020-03-27 20:27:43 -03:00
TheFurryFeline
94ddb5eb13 Vakashi's Permit Expiration 
Expired permit removal, code cleanup.

Changlog Notes:

- Removes Vakashi's Permit and allowed item.

- Also removes code for Ace's long expired permit and the same for the commented out items.
 2020-03-26 20:50:26 -04:00
EllyBrown
b6d893db49 Changes to the custom item. (#6929) 
* Add files via upload

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm
 2020-03-21 00:55:55 -04:00
Razgriz
b5ebde0b3b Nullsuits 2020-03-20 20:32:08 -07:00
Razgriz
2e4495dfd5 Update custom_boxes_ch.dm 2020-03-18 15:54:29 -07:00
Razgriz
bb167d1b86 Add files via upload 2020-03-15 23:39:00 -07:00
Meghan-Rossi
f7eabadf22 fluff items 
*Adds Medal of Valor for Brynhild Vandradottir - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1688
*Adds Medal of Valor for Lilith Vespers - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1690
*Adds Vox scrap armor for Yikatihaki - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1662
*Adds silver pocket watch for Cappy Fuzzlyfeathers - approve in https://forum.vore-station.net/viewtopic.php?f=27&t=1651
*Adds green sweater vest for Zaku Fyodorovna - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1674
 2020-03-12 17:42:19 +00:00
Shadow-Quill
68ca0231b7 Fixes everyone having the verb 
Untested
 2020-03-06 18:13:05 -06: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
Shadow-Quill
406855ce90 Merge branch 'master' into Coda-Fluff-Implant 2020-02-29 20:53:42 -06:00
Shadow
010821fb7c Fixes Size-Switching 2020-02-29 20:53:13 -06:00
Heroman
b45f37b7c8 Adds Pip's Cloak 2020-03-01 12:32:31 +10:00