cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 8 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

1073 Commits

Author SHA1 Message Date
Cameron653
5fc76df183 Merge branch 'master' into ALRAUNE_STUFF 2018-07-23 20:08:30 -04:00
Knightfall5
aa5a02c51b Update custom_items_vr.dm 2018-07-23 02:16:30 -04:00
Arokha Sieyes
46f7b22838 Fix virgo implant stuff 2018-07-21 14:21:17 -04:00
Repede
dac673181c Fluff stuff for Dushka and DeepIndigo 2018-07-14 15:59:54 -04:00
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
 2018-07-08 11:38:06 -04:00
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04: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
Mewchild
3164a98831 Shut up travis. Commenting Error 2018-06-26 02:43:43 -05:00
Mewchild
26753c4330 Seb still has a permit. Misread. 2018-06-26 00:45:03 -05:00
Mewchild
f4ce27804c Comments out a bunch of expired permits and associated weapons 2018-06-25 23:52:25 -05:00
Repede
2329922b1b Merge pull request #132 from Repede/self 
SASOperative Fluff stuff
 2018-06-24 14:14:06 -04:00
Repede
5501f97210 SASOperative Fluff stuff 2018-06-24 14:04:02 -04:00
Dwaggy
0dc547f976 Update: 
Blueshields:
 - Added blueshield headset
   -Has access to Command and Security channels
    -Has its own Encryption key set for blue-shields for this, this stops any accusations of keys been stolen from Sec.
Weapons:
 - This affects BSG and HoS, but the case the NSFW weapon comes in (HoS version), Will have two ammo mags, as opposed to the previous one.
 2018-06-24 17:44:44 +01: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
Cameron653
7028511d64 Prevents sanitization of custom icon base. Removes a custom fluff item since Alraune are now in. 2018-06-17 20:00:10 -04:00
Cameron653
8219ababc5 Makes fruit growing code on the Alraune organ based instead of implant based. Organizes the list to make it in alphabetical order. 2018-06-17 15:04:58 -04:00
Repede
5f078f9678 Harpsong fluff fix 2018-06-16 11:18:20 -04:00
Cameron653
da4773ebdb Makes Alraune variable on only /human. Changes a few 0's to FALSE and a few 1's to TRUE. 2018-06-16 01:32:55 -04:00
Repede
41ec39ab59 Fix for blueshield (maybe) + adding Harpsong's vest (Needs added to fluff list) 2018-06-15 23:39:13 -04:00
Cameron653
864c4ca106 Gives Alraune the ability to select body shape. Gives Alraune the ability to select a fruit/vegetable to grow via an implant. Some code cleanup relating to custom body shape selection. Makes species name their defines instead of "name" Fixes a typo in custom_items where the reagent generator being selected was roiz instead of pumila. 2018-06-15 16:41:59 -04:00
Aronai Sieyes
088b4d27af Merge pull request #3859 from Mewchild/MC-Fluff 
Vietsi Fluff Items
 2018-06-15 09:00:26 -04:00
Mewchild
7960499bd2 Vietsi Fluff Items 2018-06-11 12:00:27 -05:00
Aronai Sieyes
44500587f9 Merge pull request #3846 from Nepoox/master 
Adds Annie's pullover (Fluff Item)
 2018-06-11 06:10:38 -04:00
Aronai Sieyes
884a4ec99c Merge pull request #3820 from Novacat/nova-pathfinder 
Pathfinder Fixes
 2018-06-11 06:04:42 -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
Nepoox
8ff967eeec Changed name and description 2018-06-09 23:19:57 +02:00
Nepoox
e1cbfac2bf Fluff Item 2018-06-09 02:50:41 +02:00
Repede
7ff5b60680 Modkit needed for RD rig (Sheri) 2018-06-02 19:38:59 -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
Unknown
f81760da5b Pathfinder Fixes 
- Adds missing icons for other species in the Explorer suit cycler
- Fixes slot issue with drop straps and metal necklaces
- Pathfinder's Office can now only be accessed by the Pathfinder
 2018-06-02 10:54:17 -04:00
ArgobargSoup
8111652e25 Update custom_items_vr.dm 2018-06-02 03:03:27 -07:00
Unknown
994a81b6b6 Adds pumping sprite 2018-05-23 14:20:09 -04:00
Unknown
2c1ad0076f Requested Fixes 2018-05-22 12:49:41 -04:00
Unknown
ca131caa10 New Explorer Gear 
- Adds a new defensive exploration weapon intended for use by rear-line explorers, such as SARs and Pilots
- Ported Machete Sheath from Baystation, intended to be used with the machetes here
NOTE: I intended them to not be usable alongside holsters, but I am not sure how to go about this
- Explorer lockers will now come with a survival knife, machete, and machete sheath
 2018-05-22 11:27:48 -04:00
Repede
2768e46c8a Adds bioadaptive supernif things 
Basir fluff item
 2018-05-20 22:29:51 -04:00
Repede
9e69f25327 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
 2018-05-13 21:08:22 -04:00
Aronai Sieyes
86e413bf00 Merge pull request #3634 from VOREStation/aro-taur_suits_must_die 
Removes taur suits
 2018-05-08 19:09:29 -04:00
InterroLouis
dc299bdd3b Add files via upload 2018-05-07 20:24:32 -04:00
Arokha Sieyes
c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Repede
8c5bfa4a61 Fixes compile errors ayyy I'm tired 2018-05-04 01:26:35 -04:00
Repede
e9f8e986f1 I shouldn't code at fuckin 1AM in the morning during workweek 2018-05-04 01:12:20 -04:00
Repede
67afb6d2b6 woops 2018-05-04 01:11:00 -04:00
Repede
2a0bb0b3e8 Fluff fixes for naga suits (should work now ayyy) 
Strix fluff TODO: make box
 2018-05-04 01:09:14 -04:00
Repede
a039be7b30 Makes CD ID Card not swallowable by cryo, plus custom fluff rig not swallowable by cryo 
More attempts at fixing nagarigs
 2018-05-02 08:56:13 -04:00
Repede
b6c28824b0 Finally (almost) - Saur and Sheri's fluff items. 
Sadly Sheri's has sprite issues right now so only admin-spawnable (Really broken chest piece for idfk why, will investigate more eventually)
 2018-04-28 12:34:53 -04:00
Repede
372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs
 2018-04-27 21:45:13 -04:00
Arokha Sieyes
fb23176220 Adds a baby translocator for miners 2018-04-24 12:59:24 -04:00
HzDonut
980c9bea44 LeMat Fix 
Argh
 2018-04-23 09:28:33 -04:00
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-04-20 09:03:58 -04:00
Aronai Sieyes
fb7ca15439 Merge pull request #3477 from Mewchild/MC-Zaozao 
Adds Zigfe's Fluff Item
 2018-04-18 13:58:28 -04:00