cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,059 Commits 7 Branches 0 Tags
0151c0ad23b51a65bb3013d233d29026a022adc2
Commit Graph

188 Commits

Author SHA1 Message Date
Rykka
0151c0ad23 Change Commonwealth References added by #2553 to Solgov 
https://github.com/CHOMPStation2/CHOMPStation2/pull/2553

Added Commonwealth voidsuits from Bay.

Changed these to Solgov to address https://github.com/CHOMPStation2/CHOMPStation2/issues/2598

<3
 2021-08-15 15:34:30 -07:00
Nadyr
74b4b166dd powder that makes you say yes 2021-07-15 19:41:19 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Nadyr
46ceeff29b powder that makes you say yes 2021-07-12 23:48:56 -04:00
Nadyr
fd4b2e3671 powder that makes you say yes 2021-07-12 23:47:16 -04:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Chompstation Bot
c97b47de72 [MIRROR] Halves Item Slowdown Effects 2021-06-28 11:32:00 +00:00
Razgriz
fc510ae854 Pursuit hardsuit icon fixes 2021-04-30 21:51:14 -07:00
Razgriz
5ce5c523e6 Fix Pursuit hardsuit sprites again. (#1793) 
* dmi code

This should be good for all new chomp RIG sprites as long as you follow the example in this file, and should fix the current issue with the missing suit slot icon.

* Move pursuit hardsuit object icons to _ch

* Rearrange spacesuit sprites into proper file
 2021-04-11 04:49:49 -07:00
Nadyr
1751df2e78 Update station_ch.dm 2021-03-30 01:35:31 -04:00
Nadyr
1958db0517 Update alien_ch.dm 2021-03-30 01:34:54 -04:00
Sharkmare
996dac783f Adding more races to the rig whitelist for proteans 
Adding more races to the rig whitelist for proteans
 2021-03-27 17:16:53 +01:00
Razgriz
223884b27c Merge branch 'master' into ProteanNerf 2021-03-24 17:24:15 -07:00
Razgriz
3df8fe3983 Update alien_ch.dm 2021-03-24 17:17:51 -07:00
Razgriz
5b36240d21 Update alien_ch.dm 2021-03-24 15:44:59 -07:00
Razgriz
7f6e976bf2 Update alien_ch.dm 2021-03-24 15:23:48 -07:00
cadyn
533d307d99 Also add antiareli suits 2021-01-29 17:02:13 -08:00
cadyn
55376d92af Give Asset protection rigsuit thermal protection 
Asset protection is supposed to win anyways lol
 2021-01-29 16:58:51 -08:00
Razgriz
03b8fa0c9e Protean Hardsuits 
This code ports Citadel Station RP's protean hardsuit morph.

This will allow protean players to morph into a hardsuit for others to wear.

This also nerfs proteans by removing their ability to eat metals besides steel sheets.
 2021-01-25 01:12:49 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Razgriz
873371c41e Fixes roller beds and Pursuit RIG sprites 2020-07-13 01:31:05 -07:00
Killian
56503a9a67 Update robotics.dm (#7321) 2020-07-08 21:22:57 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07: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
Atermonera
51741bebe8 Merge pull request #7058 from atlantiscze/2020_04_27_HardsuitBackpack 
Allows backpacks to be carried on most hardsuits
 2020-05-03 03:20:46 -04:00
Razgriz
795a40cd1e Fix RIG sprites 
oops, forgot to add a ch to the pathname
 2020-04-27 15:40:06 -07:00
Aronai Sieyes
afe3eced2d Move boots, give CE rig advanced boots too 2020-04-18 21:53:46 -04:00
Razgriz
4e46498ba0 Pursuit hardsuit 2020-04-16 18:59:15 -07: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
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Aronai Sieyes
4cfd14849d VS: Replace 'subspace backpack' with bluespace radio 2020-04-11 12:03:10 -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
Unknown
e8282b6232 Rigsuit Slot Updates 
- Adds Defibrilator compatibility to RIGsuits
- Allows the compact RIGsuit's suit storage to be compatible with belts and compact defibrilators
 2020-03-12 12:30:09 -04:00
Aronai Sieyes
8e784cc13a Move our VR stuff into 'specific' files 2020-03-11 16:34:45 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04: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
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Razgriz
7ea23fa308 Pursuit Hardsuit 
Re-adds https://github.com/CHOMPstation/CHOMPstation/pull/310

There have been a couple changes since the original PR on old chomp over time. Thrusters have been added and it is restricted to HOS access only.
 2020-02-12 00:02:05 -07: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
Novacat
c14f3340ff Update light.dm 2020-01-21 01:11:19 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -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
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Unknown
8392aa5202 Subspace Radio slot bugfixes 
- Subspace Radio now can be slotted in hardsuit suit slots.
- Subspace Radio now works if slotted in a suit slot.
 2019-09-22 09:05:21 -04:00
Hawk_v3
9e88f55480 Merge remote-tracking branch 'upstream/release' 2019-09-16 14:57:39 +01:00
Unknown
3c4370e1d0 Fixes wrong path 2019-09-14 21:49:03 -04:00