cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 9 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

2412 Commits

Author SHA1 Message Date
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Killian
d7f156ac13 fashion attack 2: jackets 2020-02-19 22:45:01 +00:00
SplinterGP
3cce28075b Adds AMI helmet and suit sprite for vulps, and more 
Adds ami helmet and suit sprite for vulps, also adds magboots and gloves sprite but these adds to all species
 2020-02-16 17:30:06 -03:00
SplinterGP
9f31467025 Adds grey sprite for voidsuits and rigsuits helmets. 
it also changes a error that had on vulpkanin sprites
 2020-02-13 21:13:13 -03:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
81530b8c21 Merge pull request #6673 from Cerebulon/refixskirts 
Fixes Jumpskirt Sprites
 2020-02-08 14:02:30 -05:00
SplinterGP
f1e2bc6fd9 Fixes //ywedit on the lists 
title
 2020-02-07 21:11:14 -03:00
SplinterGP
1452ac0749 adds YW edits and lists them on suit cycler correctly 
Title
 2020-02-07 20:41:01 -03:00
Repede
8373f6ee8d Merge branch 'master' into master 2020-02-06 21:40:01 -05:00
SplinterGP
7c0796668d Adds grey, sprites for items, (jumpsuit etc.) for them, add them to rigsuit list, and also adds their language that they use and telepathy 2020-02-05 19:43:55 -03:00
Killian
7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
Atermonera
af6992e09a Merge pull request #6669 from Mechoid/FixSuitIconIssue 
Fix issues introduced by the world server icon system port.
 2020-02-04 15:51:20 -05:00
Novacat
f1394460c2 Merge pull request #6514 from VOREStation/upstream-merge-6651 
[MIRROR] Ports Clothing Expansion Code from World Server
 2020-02-04 11:21:37 -05:00
Atermonera
00f301d802 Merge pull request #6658 from Darlantanis/TeshariPonchoFix 
Teshari Poncho Fix
 2020-02-01 18:01:12 -05:00
Killian
052380be50 updates & fixes 2020-02-01 13:55:40 +00: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
Atermonera
1bc3ccf858 Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no 
Hacky Fix for Athletic Shorts showing Missing Icon
 2020-01-30 19:24:59 -05:00
Atermonera
130d942a2d Ports Clothing Expansion Code from World Server 2020-01-28 14:16:24 -05:00
Novacat
c14f3340ff Update light.dm 2020-01-21 01:11:19 -05:00
Novacat
110d37a4e5 Update misc_special.dm 2020-01-21 01:11:02 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes. 
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
 2019-12-25 20:40:21 +01:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Schnayy
29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Unknown
d92e151dab Fixes typo name 2019-12-06 19:32:35 -05:00
listerla
086cfb579c Adds Irrlicht's 'soft' shroud (#6545) 
* Adds Irrlicht's soft Shroud

* fixes
 2019-12-05 18:28:53 -05:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
 2019-11-29 19:13:53 -05:00
Unknown
47bc5e411e Invisible Breath Masks 2019-11-28 19:33:46 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Repede
7035e30fc3 Fixed blizzard so animals do not get killed 
Fixed the exploration shuttle console
Fixed the snowsuits sprites and actually works in cold temp
 2019-11-24 16:57:06 -05:00
RadiantFlash7
b42ccbceb1 Map fixes 
Fixes Incorrect areas in ships.dmm
Fixes random tiles/decals in main colony.
Adds missing scrubbers.
Adds snowshoes to be with snowsuits.
 2019-11-24 16:18:23 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Heroman3003
62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
Meghan-Rossi
a09456b541 Adds a way to set the tag of loadout collars as part of the loadout 2019-11-13 03:42:03 +00:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
RadiantFlash7
d57a9847c6 Disposals, snow, power, exploration 
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
fixes merge conflict as well.
 2019-10-27 15:07:48 -04:00
RadiantFlash7
86e4d8a316 Revert "Revert "Revert "Disposals, exploration, snow fixes""" 
This reverts commit ad78add3d0.
 2019-10-27 14:00:53 -04:00
Hawk_v3
c95a447b71 Merge remote-tracking branch 'upstream/master' 2019-10-27 17:58:34 +00:00
RadiantFlash7
ad78add3d0 Revert "Revert "Disposals, exploration, snow fixes"" 
This reverts commit 0f66788181.
 2019-10-27 13:57:41 -04:00
RadiantFlash7
0f66788181 Revert "Disposals, exploration, snow fixes" 
This reverts commit 16e7b75d0b.
 2019-10-27 13:56:35 -04:00
RadiantFlash7
16e7b75d0b Disposals, exploration, snow fixes 
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
 2019-10-27 13:19:06 -04:00
Cerebulon
6385a2f662 ERT Rangers Costumes (#6493) 
* Sprites

* and code fuckit
 2019-10-25 15:07:49 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00