cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 11:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
22204 Commits
Author SHA1 Message Date
Erik Darkpaws 0087147492 gdi travis you picky motherfucker 2019-05-27 15:49:29 -07:00
Erik Darkpaws efcdf16049 Fixes spam chem messages in anti-depressants and spaceacillin with prometheans. 2019-05-27 01:44:48 -07:00
Erik Darkpaws d43bfdec28 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into ErikTheDogEdits 
# Conflicts:
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
 2019-05-27 00:37:27 -07:00
Erik Darkpaws 9f54b4de22 Forgot to remove some things, which has been fixed 2019-05-26 21:46:59 -07:00
Erik Darkpaws 6cdeb1c2b4 Fixes and simplifies anti-depressant and spaceacillin + prommie message spam! 2019-05-26 21:40:26 -07:00
Nadyr f43c991bad -Adds a metamorphic pint glass 
-Adds metamorphic pint glass to booze-o-mat
-Also fixes goldschlager to use the right icon in a metaglass (it used the vodka/gin sprite before)
 2019-05-26 22:00:35 -05:00
DarlantanisandGitHub 6c29a98e89 Merge pull request #688 from TheFurryFeline/TFF-Slime_Focus_Message_Spam_Fixy 
Hotfix Message Spam
 2019-05-26 19:27:20 -05:00
DarlantanisandGitHub ece15452af Merge pull request #689 from Darlantanis/MojitoSpriteFix2 
Mojito Sprite Fix
 2019-05-26 19:26:52 -05:00
DarlantanisandGitHub a7086bc4a0 Merge pull request #690 from Razgriz1032/Razgriz1032-Teshari-security-cloak 
Teshari Security Cloak armor
 2019-05-26 19:25:22 -05:00
RazgrizandGitHub 57760acd09 Teshari Security Undercloak armor 
Teshari Security Undercloak has 1:1 stats with security jumpsuits.
 2019-05-26 12:52:07 -07:00
RazgrizandGitHub 67cafffac5 Teshari Security Cloak armor 
Teshari Security Cloak has 1:1 stats with security armor vest.
 2019-05-26 12:50:21 -07:00
Nadyr 9e876fc4ab Adds a line to the metamorphic glass to use the mojito icon which has existed but never been used. 2019-05-26 02:40:03 -05:00
TheFurryFeline bc94020ec6 Hotfix Message Spam 
Fixes spammage stuff for Spaceacillin and Prommies. Revert an edit involving Psychiatric medications and increases rate of dispersal when ingested.
 2019-05-26 02:15:19 -04:00
RazgrizandGitHub aca58a6864 Merge pull request #683 from TheFurryFeline/TFF-Dear_Deer's_Hunger 
Dear Deer's Hunger
 2019-05-24 17:00:45 -07:00
RazgrizandGitHub 46d2b08c35 Merge pull request #684 from TheFurryFeline/TFF-Shadekin_Eye-Colour_Display_Fixy 
Shadekin Eye Colour Display Fix
 2019-05-24 16:59:11 -07:00
TheFurryFeline b1e6241b22 Shadekin Eye Colour Display Fix 
On the tin, fixes the text that shows on examine which was e_purple, e_blue, etc.
 2019-05-22 21:11:34 -04:00
TheFurryFeline b4a9be9e9c Dear Deer's Hunger 
Fixes Deer mob's spawning when created either through adminspawn or cargo order. Either way, they were spawning without a belly obj and causing a runtime in DEBUG logs.
 2019-05-22 15:24:21 -04:00
VollyballyandGitHub 72eee4d639 Merge pull request #679 from Darlantanis/TeshariPonchoFix 
Did you know teshari poncho sprites have been lurking in the code?
 2019-05-21 06:57:21 -04:00
Nadyr b8761b3b26 Fixes ponchos to properly use teshari-specific sprites when worn by teshari. 
-Removes "icon override" line from ponchos
-Icon override is now set on equipping ponchos in the outer clothing slot using ties.dmi for non-teshari and seromi/suit.dmi for teshari
-Icon override is set back to null when unequipped. This prevents bugs with the poncho icons as "equipped" does not trigger when wearing a poncho as an accessory, thus making it possible to use the wrong sprites if icon override is not reset.
 2019-05-21 05:31:27 -05:00
Kazzc da3e3d82b5 Tamal Update 
Added tamales on the code and its sprite art.
Increased nutriment values of "Garlic bread", "Tocino", "Pan de nata" and "Conchas"
Added more description flavors to "pan de nata" and "Tocino"
Changed the recipe of "Pan de nata" of egg reagent to egg item.
 2019-05-21 02:06:42 -05:00
HiziaanandGitHub aff9863d70 Merge pull request #676 from kcin2001/teshhood 
fixes black and red hooded cloak hood
 2019-05-18 12:40:27 -05:00
kcin2001andGitHub 49e54c9743 fixes black and red hooded cloak hood 2019-05-17 19:47:05 -07:00
SharkmareandGitHub 80acff79bf Smile. 
Sic semper tyrannis
 2019-05-10 18:32:21 +02:00
HiziaanandGitHub b3e9155416 Merge pull request #669 from TheFurryFeline/TFF-Milk,_Please! 
Milk, Please!
 2019-05-08 18:38:46 -05:00
HiziaanandGitHub 7ffdd56fca Merge pull request #670 from TheFurryFeline/patch-18 
We Are Chompers!
 2019-05-08 18:38:37 -05:00
TheFurryFeline 6ebc182880 Digestion Hotfix 
Reverts code that broke how digestion damaged you.
 2019-05-08 18:55:10 -04:00
TheFurryFelineandGitHub b27be55b9a We Are Chompers! 
Changes loading screen name in examine. Just right-clicking previously showed Polaris. This fixes such.
 2019-05-07 18:12:16 -04:00
TheFurryFeline 58c0cc5c56 Honey Reagent Implant 
Requested item for the loadout. Enjoy!
 2019-05-07 18:05:09 -04:00
TheFurryFeline d5d78f26a4 Update loadout_implants.dm 2019-05-07 12:23:06 -04:00
TheFurryFelineandGitHub 9dd9c01b22 Restore Additional Code 2019-05-04 23:32:12 -04:00
TheFurryFelineandGitHub 5cfc448f1a Fix For Synxcode 
Re-adds code that was removed through an oversight.
 2019-05-04 22:38:14 -04:00
TheFurryFelineandGitHub 7ad2be48e2 Egg Fix 
🥚
 2019-05-04 22:03:09 -04:00
HiziaanandGitHub f298e59c98 Merge pull request #660 from kcin2001/teshhood 
adds hooded cloaks for teshari
 2019-05-04 17:15:24 -05:00
kcin2001 2656ee9fa3 adds hooded cloaks for teshari (identical mechanically to the normal cloaks just with a hood) 2019-05-03 21:53:29 -07:00
TheFurryFelineandGitHub 2ffebfd507 Borgs' and Micros' Delight 
Allow borgs to make micro mechs.
 2019-05-02 22:36:42 -04:00
TheFurryFelineandGitHub 0415d1eae7 Synthesiser Insertion Fixes Pt.1 
Prevent inserting more than what you have as a drone/borg.
 2019-05-02 22:18:18 -04:00
TheFurryFelineandGitHub 367eb1f448 Vehicle Buckling Fix 
Fixes bug with vehicle buckling.
 2019-05-02 22:14:51 -04:00
TheFurryFelineandGitHub 6470a08ae3 Conveyor Fixes 
Make them able to go the right directions, even when you make new ones.
 2019-05-02 22:08:48 -04:00
HiziaanandGitHub 046a467e0a Merge pull request #656 from TheFurryFeline/TFF-I_Got_A_Bone_To_Pick_With_You 
I Got A Bone To Pick With You
 2019-05-01 00:34:17 -05:00
TheFurryFelineandGitHub 29d7e1a74a Bone Alert 
Add new file that focuses on prey leaving behind bones, specifying a need for prefs to match in mechanical settings. 
Added:
Belly Mode Addon
Handler to leave remains
Add Prefs settings to Vore Panel - also include an egg. 🥚
 2019-04-30 23:55:51 -04:00
TheFurryFelineandGitHub b7340c4f94 It's a Crate! Or is it? 
Prevent metagamey-ness stuff with Mechanical Vore Prefs displaying.
 2019-04-30 23:50:31 -04:00
TheFurryFelineandGitHub a56ed90e0c Refactor Species Names 
On the tin, plus additional piggybacking with other edits from VoreStation related to this to make it all work. >w>
 2019-04-30 23:48:36 -04:00
HiziaanandGitHub 83034ac661 Merge pull request #655 from TheFurryFeline/TFF-Reagent_Implants_Loadout 
Reagent Implants Loadout
 2019-04-30 14:59:24 -05:00
TheFurryFelineandGitHub 28e620b6a1 Shuts Travis Up 
Adjustments to give display_names to parent datums.
 2019-04-30 15:21:19 -04:00
TheFurryFelineandGitHub 649a79c8f6 Loadout-Specific Reagent Implanters 
Add basic reagent implanters for the loadout to select.
 2019-04-30 15:02:57 -04:00
TheFurryFelineandGitHub f6b84d2d5f Implants Category 
Adds a new category to the loadout selection, moves over the implant listings from loadout_utility.dm to loadout_implants.dm
 2019-04-30 14:57:46 -04:00
TheFurryFelineandGitHub 6935e3237e Filepath Change 
New loadout selection refactors this a little bit. By removing one word, maybe, but it's still a refactor. Blep.
 2019-04-30 11:03:03 -04:00
HiziaanandGitHub 0a3fe19d0c Merge pull request #652 from TheFurryFeline/TFF-Mermaid_Tail_Flippage 
Mermaid Tail Flippage
 2019-04-28 18:04:06 -05:00
TheFurryFelineandGitHub fb19b795fe Restart Travis 2019-04-28 18:26:09 -04:00
RazgrizandGitHub 550467123d Icon fix 2019-04-28 11:57:47 -07:00