cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-22 04:26:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,824 Commits 12 Branches 0 Tags
3d1aabd69490b17f58e9742b76051f5df084e3ac
Commit Graph
2824 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
QuoteFoxandGitHub 3d1aabd694 Merge pull request #937 from quotefox/economy 
Hyper Economy part 1 - Money Movement.
 2021-01-29 01:18:58 +00:00
QuoteFox cb19bc751d conflictions 
conflictions
 2021-01-29 01:18:04 +00:00
QuoteFox 6b9a6163d3 posting their new pin to chat so they can refer to it later if they forget. 
posting their new pin to chat so they can refer to it later if they forget.
 2021-01-29 01:11:58 +00:00
QuoteFox 39a5e2863e final touches to part 1 
final touches to part 1
 2021-01-29 01:08:23 +00:00
QuoteFoxandGitHub 9366e720fa Merge pull request #935 from Kabramen/chairs 
One step closer to become IKEA: More furniture to the new woodtypes, 3 new chair bounties + one stuff for loadout
 2021-01-28 23:59:27 +00:00
Kabra_men 0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03:00
QuoteFox 6f697cb993 Revert "Merge pull request #923 from SandPoot/master" 
This reverts commit c2cf0de80a, reversing
changes made to de88764136.
 2021-01-28 21:21:29 +00:00
QuoteFox 2741595ca6 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-28 20:56:34 +00:00
QuoteFox 6c32fd97b7 auto hide belly option at round start. 
auto hide belly option at round start.
 2021-01-28 20:56:32 +00:00
QuoteFoxandGitHub 75dbead1c5 Merge pull request #930 from VladinXXV/he-is-FREE 
Adds the totally NOT Vladin "elite operative" plush and stops the Kenk plush from becoming more than friends
 2021-01-28 20:38:19 +00:00
DahlularandGitHub c2cf0de80a Merge pull request #923 from SandPoot/master 
Makes sizegun code better
 2021-01-28 13:35:31 -07:00
QuoteFox de88764136 vibrators - typos again, and lowered the arosual damage abit. 2021-01-28 14:56:37 +00:00
QuoteFoxandGitHub c856c6497a Merge pull request #934 from MalricB/sus 
Fallout Enclave Power Armor
 2021-01-28 11:49:54 +00:00
QuoteFoxandGitHub a986b60689 Merge pull request #931 from DragonTrance/plante-fixe 
A few lewd hydroponic plant changes + fixing
 2021-01-28 11:47:37 +00:00
QuoteFoxandGitHub 90e7cfc8e6 Merge pull request #933 from ToonClyde/space-syndi-asteroid-outpost-rework 
Syndi space base rework
 2021-01-28 11:47:01 +00:00
CygnusB 82921255ab whoops 2021-01-28 04:41:21 -03:00
CygnusB 765f21de24 power armor 2021-01-28 03:57:32 -03:00
QuoteFox bda5326954 typo and belly sprite fix 
typo and belly sprite fix
 2021-01-28 02:50:02 +00:00
QuoteFox c484450b18 a 
a
 2021-01-28 01:42:16 +00:00
QuoteFox b719701d72 fix 
fix
 2021-01-28 01:40:42 +00:00
QuoteFox 3772bbbcc5 vibrators and code optimization! 2021-01-28 01:36:37 +00:00
ToonClyde a94205da1e Syndi space base rework 2021-01-27 17:10:07 -07:00
DragonTranceandGitHub 13eee79e14 Merge branch 'master' into plante-fixe 2021-01-27 06:14:24 -07:00
QuoteFoxandGitHub 897b5995a6 Merge pull request #932 from Chemlight/durr-plants 
Plants and reagents
 2021-01-27 08:52:51 +00:00
Chemlight 1f8af98389 Plants and reagents 
Fixed Pink peppers and milkmelon reagents, along with all special xenobotany plants from xenoarch.
 2021-01-27 00:49:15 -08:00
DragonTrance 100c896b42 changes lewd plants a bit and fixes other plants 2021-01-27 01:00:09 -07:00
Vladin 479c003c97 Do not fuck the bird. 
Kenk plush can no longer be sex'd, as per his request.
 2021-01-26 23:43:51 -05:00
Vladin f0fd47becd Your affinity for guns is apparent. 
The mark of the Doom Slayer was burned upon his crypt, a warning to all of Hell that the terror within must never be freed. There he lies still, and ever more, in silent suffering.
 2021-01-26 23:42:17 -05:00
QuoteFoxandGitHub 4f06193ad8 Merge pull request #929 from Chemlight/Dumb-doged-sprites 
Woops made an oopsie
 2021-01-27 00:24:09 +00:00
Chemlight 528fa0da45 Woops made an oopsie 
Changed a datum path so there isn't duplicate datums
 2021-01-26 16:21:28 -08:00
QuoteFoxandGitHub 8ae4982db0 Merge pull request #928 from CapnMachaddish/map-fixes-redux 
Let's try this again
 2021-01-26 23:49:16 +00:00
CapnMachaddish e1be0c5ced Let's try this again 2021-01-26 17:42:57 -06:00
QuoteFox 07f7467daf Revert "Revert "Testing art skills"" 
This reverts commit 57146db436.
 2021-01-26 17:58:39 +00:00
QuoteFox 0057c577ed Revert "Merge pull request #924 from MalricB/sus" 
This reverts commit 85f3bb35c9, reversing
changes made to 667aa686c1.
 2021-01-26 17:58:36 +00:00
QuoteFox 57146db436 Revert "Testing art skills" 
This reverts commit 52f76bd74a.
 2021-01-26 17:55:04 +00:00
QuoteFox 586ed7c46c Revert "Merge pull request #926 from MalricB/sus" 
This reverts commit cbc7993239, reversing
changes made to c453ed509f.
 2021-01-26 17:52:14 +00:00
QuoteFox 0e39f700b7 Revert "Merge pull request #925 from CapnMachaddish/map-fixes" 
This reverts commit c453ed509f, reversing
changes made to 85f3bb35c9.
 2021-01-26 17:47:38 +00:00
QuoteFox b0b73b5e79 atm finished 
atm finished
 2021-01-26 17:43:29 +00:00
QuoteFoxandGitHub e26ed22d40 Merge pull request #927 from Chemlight/Dumb-doged-sprites 
Testing art skills / more personal stuff
 2021-01-26 15:37:37 +00:00
Chemlight 52f76bd74a Testing art skills 
I ended up practicing some spriting with  byond's editing software, I'll have to find better methods about how to do this (like uploading a png from SAI) Regargless I liked how these all came out it was too good that not putting them in would be a waste.
 2021-01-26 07:21:30 -08:00
QuoteFoxandGitHub cbc7993239 Merge pull request #926 from MalricB/sus 
(E)Rp is now legal
 2021-01-26 14:30:45 +00:00
CygnusB 086debf760 Update emergency_button.dm 2021-01-26 11:26:49 -03:00
QuoteFoxandGitHub c453ed509f Merge pull request #925 from CapnMachaddish/map-fixes 
Bar disposals fix
 2021-01-26 11:56:30 +00:00
QuoteFoxandGitHub 85f3bb35c9 Merge pull request #924 from MalricB/sus 
!! Emergency Staff Meeting !!
 2021-01-26 11:56:12 +00:00
QuoteFoxandGitHub 667aa686c1 Merge pull request #922 from Kabramen/walls 
Walls and poker tables for the new wood types
 2021-01-26 11:54:40 +00:00
CapnMachaddish 3a11fcd12b I FINALLY UNDERSTAND DISPOSALS 2021-01-26 04:23:03 -06:00
CygnusB 5a36089097 god bless strongDMM 
everything should be poggin' now
 2021-01-26 00:54:56 -03:00
CygnusB 3f66d98433 Revert "adds to meta + pubby hopefully???" 
This reverts commit 50705b591f.
 2021-01-26 00:47:56 -03:00
CygnusB 50705b591f adds to meta + pubby hopefully??? 2021-01-26 00:10:42 -03:00
CygnusB 5c55fd0c08 quotefox kinda sus ngl 2021-01-25 23:55:20 -03:00