cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 7 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

945 Commits

Author SHA1 Message Date
JoanRisu
0ecd0a51be Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-12-12 18:37:33 +09:00
JoanRisu
2ca24521d9 fixing PDAs and adding squirrelkin language. 2016-12-12 18:36:12 +09:00
Kelshark
5473eae975 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	.gitignore
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
 2016-12-11 13:41:38 -05:00
Cinder
6e72f73f99 Update custom_boxes_vr.dm 2016-12-04 19:25:13 -06:00
Cinder
d39e075610 Update custom_items_vr.dm 2016-11-30 19:05:35 -06:00
Cinder
6fa444c289 Added IvyMooMoo's HoloID / a kit so it spawns 
Kit includes:
-Ivy's HoloID
-A Vanilla Cake
-A Box of Cigarettes
-A Box of Matches
-A White Beret
 2016-11-30 02:36:13 -06:00
izac112
aecb675248 Actually working fluff for the gloves, zippo, jacket and beret 2016-11-27 19:46:03 +01:00
Kelshark
5d39e497d4 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2016-11-12 16:36:18 -05:00
izac112
b99091c7a7 Revert "Amara fluff update" 2016-11-12 22:32:28 +01:00
Kelshark
8dba7b7e14 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2016-11-11 21:31:01 -05:00
Kelshark
c0d28321d8 Merge branch 'master' of https://github.com/VOREStation/VOREStation 2016-11-11 21:30:36 -05:00
izac112
e71829db28 sdsa 2016-11-12 03:25:41 +01:00
Spades
1c4a0cefc9 Merge pull request #715 from VOREStation/screepr 
Fix Scree's fluff item issue
 2016-11-09 15:19:56 -05:00
Arokha Sieyes
78014b957c Merge pull request #709 from Cameron653/master 
Enables SilencedMP5A5's custom items. Taursuit bugfix.
 2016-11-09 12:29:04 -05:00
Arokha Sieyes
8060a265da Fix Scree's fluff item issue 
I couldn't update his PR so I did my own. It turns out that the if(..()) thing is how all the other can_mob_equip things handle their calls to ..() so we'll just do that too. Also I named my things backwards, derp.
 2016-11-09 12:22:59 -05:00
Cameron653
371be00963 Update custom_items_vr.dm 2016-11-08 14:11:19 -05:00
Cameron653
cbec44928b Fixes all the problems. Hopefully ..() works 
Going to test this real quick
 2016-11-08 14:08:02 -05:00
Cameron653
f2bb3989d5 Adds 2016-11-07 20:35:04 -05:00
Kelshark
b9cc613cc7 Fluff items fixes and merges with virgo, as well as new FREEFALLIIIN song 2016-11-07 13:47:43 -05:00
Kelshark
668b3dc6db Merge branch 'master' of https://github.com/VOREStation/VOREStation 2016-11-07 12:14:58 -05:00
Screemonster
14f64dd876 Custom items for Jemli 2016-11-07 03:57:21 +00:00
Cameron653
76e798cddc Update custom_items_vr.dm 2016-11-06 21:29:58 -05:00
JoanRisu
c4a0a306b1 Thanks, Travis 2016-11-05 07:26:19 -07:00
JoanRisu
25533ab015 Added a bunch of items. 
+Adds Octavious suit, coat, cane, bowler hat, and mask
+Adds new .357 flash, rubber, stun ammunition.
~Changes Tasald's .38 SA to .357 SA because the SA code isn't broken anymore. Permit changed to reflect this. Also changes default ammo to rubber.
+Jacob Dragon's Earthen Breath items
~Added the following already in-game items to the spawn list:
+Serkii's bunny slippers
+Killjaden's character Lassara's Knife Harness
+SilverTalismen's character Tasy Ruffle's sexy clown stuff
+Viveret's character Silentio sexy mime stuff

+Added sprites for:
+Zaeperry99's character Lexi's Prayer mat
+Viveret's character We-B's holopen
 2016-11-05 07:10:15 -07:00
Kelshark
e8510978dc Merge branch 'master' of https://github.com/VOREStation/VOREStation 2016-11-02 14:08:14 -04:00
Kelshark
e366747a6e Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
#	icons/mob/human_races/r_def_xenochimera.dmi
#	icons/mob/human_races/r_xenochimera.dmi
#	maps/RandomZLevels/blackmarketpackers.dmm
#	vorestation.dme
 2016-11-02 14:07:59 -04:00
Arokha Sieyes
aed841a97d Adds for centcom jobs 
... and me ;v
 2016-10-22 18:35:13 -04:00
Arokha Sieyes
2dd7369080 Remove trailing slash, update suit name because I can't decide 2016-10-21 16:40:20 -04:00
Arokha Sieyes
cfff650f29 More merge conflict fixing that didn't happen before, plus fix rolling down khi jumpsuits, and change my own spacesuit 2016-10-21 00:18:46 -04:00
Arokha Sieyes
6d533df04f Merge pull request #663 from JoanRisu/Fluff_Items_worshop 
Fluff items worshop....5? Sequels are hard.
 2016-10-20 12:38:15 -04:00
Arokha Sieyes
f4c0239ab5 Further tweak to tempest hud 2016-10-19 20:23:23 -04:00
JoanRisu
ae797f1e85 quick hotfix 2016-10-19 17:05:53 -07:00
JoanRisu
1bc67f334b Lots changes. Mostly involves getting the charges for Aro's gun and my Dominator, attempts to fix Molener's items, little typos fixes here and there. Also changes some item sprites. 2016-10-19 17:02:14 -07:00
JoanRisu
60d3b937b9 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-10-19 14:07:51 -07:00
Arokha Sieyes
3acc33c3a5 Fed and KHI Uniforms/Suits 
Adds Joan's Fed overcoats and my KHI uniforms as optional alternate uniforms for departments. Each requires you to be in that department to let you spawn with it.

(The Kitsuhana.dmi change is a change to my own synth sprite to fix a sprite error, unrelated)
(Also updates the sprite in custom_clothes_vr.dmi for an item for Tempest for her medhud)
 2016-10-19 15:20:35 -04:00
Arokha Sieyes
a11d4d202e Small tweak 
Just optimized it so it wouldn't stay being processed if the user leaves via elevator/cryo or is admin-deleted.
 2016-10-14 02:34:58 -04:00
Arokha Sieyes
00405946a4 Adds KH life crystal fluff/loadout item 
It just exists as a fluff excuse as to how you get cloned offsite if you don't get cloned at CC, if you want an alternative. The little lore behind it is that it notifies an offsite agency if you die so you can get cloned by them. It has a little paper in the carrying case explaining that.

It's a uniform accessory, or you can just pocket it. They are unmarked, so finding a broken one shouldn't be very interesting evidence or influence much outside just the fluff idea of their existence.

(Also, it's a crystal, but no it's not magic. The manual goes into detail about the power source, transmitter, etc.)
 2016-10-14 01:52:28 -04:00
Spades
570c2474c3 Fixes w_class of items to be consistent with Polaris update (#636) 
* Fixes w_class of items to be consistent with Polaris update

* Typo
 2016-10-09 19:23:10 -04:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Kelshark
36aedc2c82 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/taurs_vr.dmi
 2016-10-07 14:24:55 -04:00
JoanRisu
348ec23b40 Clothes edit 2016-10-02 18:08:11 -07:00
Cameron653
900dde68a9 Adds in security wolf-taur suit and a custom item (#599) 
* Adds in security wolf-taur suit and custom item

* Adds in helmet sprite
 2016-09-27 01:08:31 -04:00
Spades
e8b112fdc1 Contraband Update (#564) 2016-09-18 23:17:55 -04:00
JoanRisu
342a8d04c7 Adjusting some fluff items and adding in the security train for testing and further coding. (#560) 2016-09-17 23:38:45 -04:00
Kelshark
e0a77b629d Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/hub.dm
#	code/modules/clothing/spacesuits/rig/suits/station_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	vorestation.dme
 2016-08-21 16:05:27 -04:00
Screemonster
10dd1ef835 Fixes path for fluff hoscoats. 2016-08-21 13:15:15 +01:00
Screemonster
52e0af5255 Fixes the pompom so it actually lights up and has its hudbutton back. Also fixes a spelling error in the spacesuit. 2016-08-21 04:36:27 +01:00
Kelshark
6471abc09d tiny spear fix 2016-08-20 13:23:04 -04:00
Kelshark
276a970cb2 Fixed Madoka spear completely 2016-08-19 21:22:47 -04:00
Kelshark
f5d8009f7b Fixed mask sprites breaking and fixed spear back icon. 
Spear is still a TODO
 2016-08-12 22:53:09 -04:00