cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-21 12:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,993 Commits 12 Branches 0 Tags
973e45e102746daf1e2b73dc11e376924cdabee3
Commit Graph
2993 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
QuoteFoxandGitHub 973e45e102 Merge pull request #983 from DragonTrance/plant-adding 
Botany Changes
 2021-02-21 23:08:24 +00:00
DragonTrance 3da00de2cd opaque > transparent 2021-02-21 14:22:46 -07:00
QuoteFoxandGitHub ad2b9d452c Merge pull request #982 from Kharkov72/sign 
Welcome to the cum zone
 2021-02-21 21:13:07 +00:00
DragonTrance 09038b7659 Merge branch 'plant-adding' of https://github.com/DragonTrance/Hyper-Station-13 into plant-adding 2021-02-21 12:09:21 -07:00
DragonTrance aac2f47e38 i hope to god this doesnt make it conflicted again 2021-02-21 12:08:59 -07:00
DragonTranceandGitHub 3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance 0dea34de3a test 2021-02-21 12:03:05 -07:00
DragonTranceandGitHub 5e37c0d957 github please i beg you 2021-02-21 11:45:07 -07:00
DragonTrance 18b188f46e conflicts 2021-02-21 11:42:04 -07:00
DragonTrance 2c5752fbe0 testing to see if this affects conflicts 2021-02-21 11:12:23 -07:00
DragonTranceandGitHub 84d8e1a44f Update organic.dm 2021-02-21 11:01:51 -07:00
DragonTrance c729c61765 added tons of botany changes from citadel (not instability) 2021-02-21 09:57:29 -07:00
DragonTrance 24cb27b67c #5 2021-02-21 08:37:10 -07:00
QuoteFox 7d7c6fedc9 asay notifications 
for admins.
 2021-02-21 11:40:02 +00:00
QuoteFox 8e12eae0f3 fix patreon reward 2021-02-21 11:08:37 +00:00
QuoteFox d24bafb858 Removed "Your back is feeling a little sore" and useless titty messages. 2021-02-21 10:57:58 +00:00
Kharkov72 4e2d9a3bd0 I cannot let this go unadded 2021-02-21 00:53:05 -05:00
QuoteFoxandGitHub 143fce334f Merge pull request #981 from lyricalpaws/master 
Lets people (ACTUALLY) change the engravings on zippos
 2021-02-20 18:42:14 +00:00
Chloe Carver-Brown 63063ecd9b It liiiiiives 2021-02-20 14:48:12 +00:00
ChloeandGitHub 3bff1b5a64 Merge pull request #4 from quotefox/master 
update
 2021-02-20 14:22:10 +00:00
QuoteFoxandGitHub 1326cf32eb Merge pull request #980 from lyricalpaws/clustaur 
Clustaur grenades
 2021-02-20 06:32:18 +00:00
QuoteFoxandGitHub 940a6b0ade Merge pull request #979 from lyricalpaws/master 
Lets people change the engravings on zippos
 2021-02-20 06:31:59 +00:00
QuoteFoxandGitHub 10f7bafdd4 Merge pull request #978 from Chemlight/AI-time-lock 
Time requirement on AI
 2021-02-20 00:50:51 +00:00
Chloe Carver-Brown a38a978f70 Revert "Poggers" 
This reverts commit 389291b46a.
 2021-02-19 23:35:57 +00:00
Chloe Carver-Brown 6d8d602907 Adding clustaur grenades 2021-02-19 23:21:12 +00:00
ChloeandGitHub 4195e0bd72 Merge pull request #3 from quotefox/master 
Update
 2021-02-19 22:23:08 +00:00
Chloe Carver-Brown 389291b46a Poggers 2021-02-19 22:19:12 +00:00
Chemlight 600e329216 Time requirement on AI 
I've been seeing a lot of new players jump straight into AI when really they honestly need to get some experience first before jumping into things (and possibly causing damage).
 2021-02-19 03:30:27 -08:00
DahlularandGitHub c679a26897 Merge pull request #977 from Chemlight/Testing-whitelisting-items 
Struggling with how the ckeywhitelist wants to work
 2021-02-15 23:47:01 -07:00
DahlularandGitHub 9753c7e7bc Merge pull request #976 from lyricalpaws/master 
Eyepatch glasses!
 2021-02-15 23:46:21 -07:00
Chloe Carver-Brown 0699845118 Makes the sec eyepatch flashproof and use glasses 2021-02-16 04:23:20 +00:00
ChloeandGitHub eccf7b3237 Update _glasses.dm 2021-02-16 00:41:49 +00:00
Chemlight e9390a0f64 Struggling with how the ckeywhitelist wants to work 
Round two electric boogaloo .
 2021-02-15 16:25:54 -08:00
Chloe Carver-Brown 5ed5ebc96b Merge branch 'master' of github.com:lyricalpaws/Hyper-Station-13 2021-02-15 23:50:57 +00:00
Chloe Carver-Brown c1c9b3bba2 Poggers 2021-02-15 23:47:04 +00:00
ChloeandGitHub 799914e37a Merge pull request #2 from quotefox/master 
update
 2021-02-15 15:10:37 +00:00
QuoteFoxandGitHub ecac8f739a Merge pull request #975 from Chemlight/Enzo-Plush 
A quick coding test
 2021-02-14 22:52:53 +00:00
QuoteFoxandGitHub e24137e60b Merge pull request #974 from ToonClyde/fix 
bar, kitchen, and hallway tweak
 2021-02-14 22:52:45 +00:00
QuoteFoxandGitHub c9341c27a5 Merge pull request #973 from VladinXXV/cupid 
Amor in aura est
 2021-02-14 22:52:27 +00:00
QuoteFox c444b521e5 Compile error fix. 2021-02-14 22:11:09 +00:00
QuoteFox 794f3dedbd hunger fixes, Water SHOULD HYDRATE NOW 2021-02-14 15:33:43 +00:00
Chemlight 406549dd6b A quick coding test 
Seeing if ckey sensitive whitelisting only uses lowercase, or if they're angry with uppercase.
 2021-02-13 21:10:51 -08:00
ToonClyde 82bc29ba7f bar, kitchen, and hallway tweak 2021-02-13 20:54:52 -07:00
Vladin 1bfe8bb816 love in the air 
no not really thats actually nerve gas
 2021-02-13 21:51:56 -05:00
QuoteFoxandGitHub 29237e5f8a Merge pull request #972 from Enzo-Leon/maps2 
Map Adjustments
 2021-02-13 23:34:20 +00:00
Anthony Rodriguez 383a51856d Map Adjustments 2021-02-13 15:17:41 -08:00
QuoteFoxandGitHub ab9313cf42 Merge pull request #971 from Chemlight/Enzo-Plush 
Donator items for Enzo_Leon
 2021-02-13 23:00:45 +00:00
Chemlight 659f3b7885 Donator items for Enzo_Leon 
Includes a shirt, jacket, and plushie
 2021-02-13 14:56:45 -08:00
QuoteFoxandGitHub b0fbee45e8 Merge pull request #970 from quotefox/thirst 
We got hunger, why not thirst! - Hydration system
 2021-02-13 15:09:16 +00:00
QuoteFox 3a88f7bfcc syndicates vendors are now free 2021-02-13 15:08:56 +00:00