cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-15 16:16:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,586 Commits 66 Branches 25 Tags
59d06f2de06b73e817cb0ba193e136b74ca73d21
Commit Graph
22085 Commits
Author SHA1 Message Date
RazgrizandGitHub 59d06f2de0 Merge pull request #717 from kcin2001/Slurpslime 
adds slime reagant,implant and metaglas sprite
 2019-06-12 23:27:34 -07:00
kcin2001 92c266c7e4 COPYPASTA! (fixed copypasta error) 2019-06-12 22:54:38 -07:00
kcin2001 1c95fb840e adds slime reagant,implant and metaglas sprite 2019-06-12 22:39:20 -07:00
RazgrizandGitHub b643b53a8a Merge pull request #716 from Sharkmare/patch-81 
Explaining how to make custom shadekin
 2019-06-12 18:22:17 -07:00
SharkmareandGitHub 2dcf740665 Fixing one instance that didnt say proto, woops 2019-06-12 04:13:29 +02:00
SharkmareandGitHub 30ed167ae6 Explaining how to make custom shadekin 
Added some basic comments about how to write the code for a new custom shadekin.
Explained in comments what each value is for to make it more accesible to people new to this.
Documented the 2 main files needed for sprites (Body and tail)

Added a new shadekin called Proto, you will never see him in game.
But hey don't hesitate to check him out in code to learn how to write one of your own.
 2019-06-11 11:02:16 +02:00
SharkmareandGitHub 7990acf68f list() 2019-06-11 10:10:51 +02:00
SharkmareandGitHub cbb4471e67 Beam type that changes damage type 
Beam type that on_hit() changes randomly between 6 damage types.
Possible types:
HALLOSS , BURN , BRUTE , CLONE , OXY , TOX
Damage is standard beam 40.
Resistance checked is laser

Not tied to a weapon currently. (unused)
 2019-06-11 10:02:06 +02:00
MovlerandGitHub ccde1d5f61 Rollerbeds and Droppers for the poor medihounds 
Allowing medihounds to use industrial dropper to aid in chemistry making and giving them a rollerbed rack to let them use rollerbeds
 2019-06-11 00:03:40 +02:00
RazgrizandGitHub c7ab1e76b3 Merge pull request #712 from kcin2001/teshhood 
makes it so tesh hoods hide hair
 2019-06-06 19:33:47 -07:00
kcin2001andGitHub fb7e0fa99e makes it so hoods hide hair 
makes it so hoods hide hair
 2019-06-06 15:52:25 -07:00
SharkmareandGitHub 2bafa4a22a Update types.dm 2019-06-06 05:17:17 +02:00
SharkmareandGitHub aaea238042 Code for Anno Shadekin 2019-06-06 01:59:23 +02:00
RazgrizandGitHub f981c8a60d Merge pull request #708 from TheFurryFeline/TFF-Infinite_Frame_Fixy 
Infinite Frame Fixy
 2019-06-03 23:21:14 -07:00
RazgrizandGitHub 19ec474096 Merge pull request #709 from Razgriz1032/Razgriz1032-tactical-jumpsuit-roll 
Tactical jumpsuit roll
 2019-06-03 21:48:13 -07:00
RazgrizandGitHub 7e72d9ac3c Tactical jumpsuit can roll down or roll sleeves 2019-06-03 21:09:33 -07:00
TheFurryFeline 83f7801c16 Revert Changes 
Perma runtime with this thing if wires are added into a battery rack to make a terminal. Reverting changes to the file.
 2019-06-03 19:59:53 -04:00
TheFurryFeline 74e83772f0 Copy-Pasta Fix 2019-06-03 19:19:11 -04:00
TheFurryFeline 633321a55a Missed a Comment 2019-06-03 18:42:24 -04:00
TheFurryFeline 6820f7c974 Merge branch 'master' into TFF-Infinite_Frame_Fixy 2019-06-03 18:18:03 -04:00
TheFurryFeline e3e442e9b0 Infinite Frame Fixy 
Ports https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/855 to fix runtimes for several machinery objects.
 2019-06-03 18:14:44 -04:00
Razgriz1032 e67ed7bf06 New Shadekin: Rakshasa 
Added a new shadekin named Rakshasa. Also removed all the four space indents in the shadekin types file and replaced them with tab indents like a NORMAL HUMAN. TRAVIS, YOU WERE SLEEPING ON THE JOB!!!!!!!!!!
 2019-06-02 17:48:28 -07:00
Razgriz1032 05c351073f Disabled Space Dust event 
All it did was spawn a bunch of spinny, yet inert, rocks in dead space. They did nothing.
 2019-06-02 00:30:49 -07:00
RazgrizandGitHub 84f1bc52bc Merge pull request #701 from Darlantanis/CouchUpgrade 
Couch Upgrade
 2019-06-01 14:11:40 -07:00
RazgrizandGitHub 250faaacce Merge pull request #698 from Razgriz1032/Razgriz1032-slime-escape 
Slimes re-enabled and fix
 2019-06-01 14:11:21 -07:00
Nadyr 592aacac6e -Adds as many colored couches as there are comfy chairs 
-Reclassifies current couch as "old couch," still buildable
-Fixes the directions on the corner couch sprite to rotate like it should
 2019-06-01 05:48:26 -05:00
RazgrizandGitHub c0325a2a6e Fixed slime event 
Copied line 41 from spiders. Also rearranged line 40 a bit. Seems to have fixed it.
 2019-05-28 22:51:15 -07:00
RazgrizandGitHub 6747a159e3 Merge pull request #697 from Darlantanis/ParadiseCouchPort 
Basic Paradise couch port
 2019-05-28 21:58:38 -07:00
Nadyr 3248675fed -Adds basic steel couches from Paradise. 
-Adds icons for said couches.
-Adds recipes for couches (2 steel per couch).
 2019-05-28 23:43:51 -05:00
RazgrizandGitHub 14ec472688 Merge pull request #696 from Razgriz1032/Razgriz1032-slime-event 
Slime event disabled
 2019-05-28 21:18:32 -07:00
RazgrizandGitHub 6214164048 Disable slime event 
They broken anyway.
 2019-05-28 21:05:14 -07:00
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