cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,536 Commits 7 Branches 0 Tags
dac673181c89776738588ffd64b51cdc32aa259b
Commit Graph

1328 Commits

Author SHA1 Message Date
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
Verkister
82dd96a141 Adds a bunch of new sprite accessories. 
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
 2018-06-29 15:32:30 +03: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
Leshana
c377a4a6c0 Use rust-g to optimize saving of vore persistent settings if available. 2018-06-17 19:11:17 -04:00
Repede
5f078f9678 Harpsong fluff fix 2018-06-16 11:18:20 -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
Aronai Sieyes
f3ab493437 Merge pull request #3863 from Verkister/transflavor 
Makes belly transfers update contamination.
 2018-06-15 09:02:56 -04:00
Aronai Sieyes
088b4d27af Merge pull request #3859 from Mewchild/MC-Fluff 
Vietsi Fluff Items
 2018-06-15 09:00:26 -04:00
Aronai Sieyes
9522612c98 Merge pull request #3834 from granodd/sprites 
More Ear Sprites
 2018-06-15 08:57:41 -04:00
Verkister
2c4a123f43 Makes belly transfers update contamination. 
-Transfers from itemweak belly to another now reset the contamination according to the target gut's settings.
 2018-06-12 10:21:02 +03:00
Mewchild
7960499bd2 Vietsi Fluff Items 2018-06-11 12:00:27 -05:00
Aronai Sieyes
3ba9361c77 Merge pull request #3849 from deathride58/dispvoreprefs 
Adds a button to view the mechanical voreprefs of a mob when examining
 2018-06-11 06:11:20 -04: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
deathride58
7c55a4f817 don't code on 48 hours of sleep deprivation - fixes bolding in vorepref display, makes simpleanimal examine a little more compact 2018-06-09 07:41:52 -04:00
deathride58
2118a4ce73 adds a button to view the mechanical vore prefs of a mob when examining 2018-06-09 07:00:44 -04:00
Repede
8cc1047023 Lots of new markings and stuff 2018-06-08 21:24:32 -04:00
Nepoox
e1cbfac2bf Fluff Item 2018-06-09 02:50:41 +02:00
Repede
c0ea30d5ba Readded fatty taurs, 
Added Harpsongs new centtaur sprite
 2018-06-06 19:52:48 -04:00
Granodd
350b6f5ea8 New sprites for Virgo. 2018-06-05 14:13:11 -04: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
Aronai Sieyes
243bee8965 Merge pull request #3737 from Verkister/patch-25 
Makes gurgled ID description even more obvious.
 2018-05-24 17:36:59 -04:00
Aronai Sieyes
03e709d92f Merge pull request #3739 from Novacat/MiscTweaks 
New Explorer Gear
 2018-05-24 09:18:51 -04:00
Unknown
994a81b6b6 Adds pumping sprite 2018-05-23 14:20:09 -04:00
Aronai Sieyes
4e8511abe7 Merge pull request #3741 from Verkister/nastyidcards 
Adds and utilizes gurgled versions for all IDs
 2018-05-23 10:34:24 -04:00
Verkister
285b29b34c Adds and utilizes gurgled versions for all IDs 
-Now all different looking IDs have their sprited gurgled counterparts.
-This means gurgled IDs and guestpasses no longer all turn into the nasty default ID sprite.
 2018-05-23 10:11:53 +03:00
Repede
7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-05-23 00:13:07 -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
Verkister
fb1e61a5b5 Update digest_act_vr.dm 2018-05-22 16:46:45 +03:00
Verkister
7d5d4a22d7 Update digest_act_vr.dm 2018-05-22 16:07:33 +03:00
Verkister
e93a0949f1 Makes gurgled ID description even more obvious. 
People are still thinking they're completely wasted trash.
 2018-05-22 16:05:52 +03:00
Repede
2768e46c8a Adds bioadaptive supernif things 
Basir fluff item
 2018-05-20 22:29:51 -04:00
Aronai Sieyes
bab82e9d01 Merge pull request #3688 from Heroman3003/no-riding-tents 
Tentacles can be ridden no more
 2018-05-16 18:44:48 -04:00
Aronai Sieyes
d52923b17c Merge pull request #3667 from Verkister/nifsleeve 
Fixes a bunch of NIF/resleeving related issues (and a tiny otherthing i discovered during tests)
 2018-05-16 18:41:01 -04:00
Heroman3003
f8e8ba3e3a Removed riding tentacles/Unique text for Alraune 2018-05-15 12:11:15 +10:00