cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,862 Commits 8 Branches 0 Tags
f20f331fd6fb2bc1c2d6540ec9804cfa00d7ca08
Commit Graph

1169 Commits

Author SHA1 Message Date
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -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
Novacat
702ccbee5c Update lungs.dm 2020-03-27 08:39:57 -04:00
Atermonera
c49c1e40f3 Fix runtimes in lungs.dm 2020-03-27 03:18:28 -04:00
Arokha Sieyes
34a9cd4561 Fix stupid lung runtime 2020-03-27 00:41:36 -04:00
Novacat
94f5eda84c Merge pull request #6967 from VOREStation/upstream-merge-6881 
[MIRROR] Add mob/living stat setter and observer
 2020-03-23 23:25:02 -04:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Atermonera
1873a3a870 Merge pull request #6880 from Greenjoe12345/teshariprosthetics 
Teshari prosthetics
 2020-03-23 22:38:13 -04:00
Holdelta
9cc3d90ded Allowing Custom Species access to DSI - Teshari prosthetic limbs. 
Since Teshari are allowed to be created as a custom race to begin with, I'm not seeing too many issues with this change.

Tested on local and the main thing to note is that the user has to choose Icon Base as Teshari to avoid any weirdness with gear, otherwise works as expected.
 2020-03-22 14:07:37 -07:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Aronai Sieyes
91d4e6897a Prosthetic Expansion: Advent of Species 
Update robolimbs.dm
Update vorestation.dme
Update prosfab_designs.dm
Fix prosfab_designs.dm
 2020-03-14 14:04:06 -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
967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -05:00
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
Aronai Sieyes
b3b51a7c3a New sprites for discs with unique colors 
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.

Sprites from CEV-Eris.
 2020-02-20 21:37:15 -05:00
Unknown
146d7ec7e1 Minor Protean Balans Tweaks 
- Boosts limb health to be roughly the same as Prometheans
- Gives slight brute resist
- Slightly reduces burn weakness
 2020-02-19 20:22:28 -05:00
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -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
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
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
Rykka
4a78b14451 Port over Roundstats System 2020-01-15 16:42:41 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
TheFurryFeline
2754068163 More Fixes 
Brollies, T-comms access fix, body designer, Erik's Lungs
 2019-12-31 20:03:39 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
ba8a46bb03 Merge pull request #6565 from Heroman3003/eyecolor-fix 
Fixes species without eyecolor being able to get one
 2019-12-15 14:49:27 -05:00
Heroman3003
402d0acebf Fixes vorestation species without eyecolor being able to have eyecolor 2019-12-14 09:51:20 +10:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Unknown
985d57f323 513 Compatability 2019-12-12 10:40:27 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Novacat
26b0f83192 Merge pull request #6241 from Heroman3003/black-eyed-fluffers 
New Species: Black-Eyed Shadekin
 2019-12-06 11:37:23 -05:00
Heroman3003
69ca6dc2f3 Gives crewkin less weakness to attacks, but weaker bones 2019-12-03 09:54:00 +10:00
Anewbe
a1e0aa8b90 Merge pull request #6539 from Mechoid/FixBioprinter 
Fix the bioprinter
 2019-11-29 19:51:23 -05:00
Heroman3003
4bef69e32a Adds black-eyed shadekin 2019-11-26 09:35:24 +10:00
Hawk_v3
bafec81a0a Merge Upstream 2019-11-22 23:40:13 +00:00
Unknown
04ec5cf365 Fixes robolimb/ear path problems 2019-11-22 07:56:05 -05:00
Novacat
99301d33c0 Merge pull request #6216 from NoctuaAngelis/master 
Fix for tucker0666 fluff
 2019-11-22 07:22:05 -05:00
NoctuaAngelis
d6607f3c4d Add files via upload 2019-11-22 04:04:17 -06:00
NoctuaAngelis
481028c64e Add files via upload 2019-11-22 03:58:33 -06:00
Novacat
9ac320a347 Merge pull request #6194 from Heroman3003/shadekin-mini-fix 
Fixes minor issues with shadekin
 2019-11-21 21:43:44 -05:00
Sara Elizabeth
f3a2a1700a Merge remote-tracking branch 'VOREStation/master' 2019-11-17 11:20:39 -06:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
NoctuaAngelis
14cf784d3b Add files via upload 2019-11-16 17:11:54 -06:00
Heroman
eeb121a9b1 Fixes minor issues with shadekin 2019-11-16 13:04:01 +10:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00