cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-18 10:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,991 Commits 12 Branches 0 Tags
b4eac5e28ab4f8f5ce6bdc3abbb338231ebda399
Commit Graph
166 Commits
Author SHA1 Message Date
QuoteFoxandGitHub 1b3d33388a Merge pull request #671 from ArchieBeepBoop/indicators 
Typing Indicators
 2020-11-10 16:58:24 +00:00
DahlularandGitHub b25faa3d24 Merge pull request #656 from Jay-Sparrow/Head-restrtict 
Junior roles
 2020-11-10 01:56:36 -07:00
Dip 6eebc1d649 Typing Indicators 2020-11-10 01:52:06 -03:00
JaySparrow ea5b9ca4ef Junior roles 
And more! Oof ouch my soul.
 2020-11-04 00:37:23 -06:00
kevinz000andDip 752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216 
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
 2020-11-03 01:51:18 -03:00
GhomandDip 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
kevinz000andDip b0a2ebdf3e Merge pull request #9960 from Ghommie/Ghommie-cit398 
Ports custom reagent icecreams.
 2020-10-30 04:27:59 -03:00
DahlularandGitHub ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky 
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
 2020-10-29 22:51:07 -06:00
Dip 9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
DahlularandGitHub bbbd52a4a4 Merge pull request #623 from ArchieBeepBoop/numbertwo 
Ports: GetComponent macros removal, and few other updates.
 2020-10-29 10:30:33 -06:00
Dip 138b7a0aa0 this dullahan bullshit is going to make me kill myself 2020-10-28 16:29:53 -03:00
kevinz000andDip 731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303 
Dullahans fixes and QoL.
 2020-10-28 16:25:19 -03:00
kevinz000andDip 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2020-10-28 05:48:57 -03:00
kevinz000andDip f1f89cbb50 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining 
The art of drunken captaining
 2020-10-28 05:12:18 -03:00
kevinz000andDip 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259 
Porting GetComponent macros removal, and few other updates.
 2020-10-27 14:42:55 -03:00
kevinz000andDip 7034e00e1c Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining 
The art of drunken captaining
 2020-10-27 13:28:17 -03:00
Dip c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
Dip 682eb7b9b6 gotta make sure this works yo 2020-10-17 22:25:29 -03:00
deathride58andDip cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2020-10-17 22:25:16 -03:00
QuoteFoxandGitHub 5ceb438065 Merge pull request #592 from ArchieBeepBoop/pipes 
Port TG Pipe Layers updates, Freezer Layer Update and RPD icon reorder
 2020-10-16 12:32:05 +01:00
kevinz000andDip c952c3ecff Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112) 
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
 2020-10-15 01:56:47 -03:00
kevinz000andArchie f6c62c57ba Merge pull request #10605 from r4d6/Layer 
Port TG Layers updates and Freezer update
 2020-10-14 02:34:25 -03:00
GhomandDip 779cc787a3 Merge pull request #10541 from Detective-Google/the-p-o-o-l 
adds the POOL
 2020-10-07 18:40:10 -03:00
Dip 52eaf9ed92 BOY 2020-10-05 11:07:52 -03:00
QuoteFox 631090cf04 Dynamic glidespeed 
ported from yogstation
 2020-10-05 03:58:10 +01:00
QuoteFoxandGitHub 5e298aac96 Merge pull request #549 from ArchieBeepBoop/moveforce 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-10-05 02:59:39 +01:00
DahlularandGitHub 5516a724ef Merge pull request #546 from ArchieBeepBoop/cluwnenew 
Floor Cluwne Forced Targeting / Cluwne Smite
 2020-10-04 03:12:19 -06:00
kevinz000andDip b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-10-03 19:35:47 -03:00
Dip 7fe8270f17 cluwnefix 2020-10-03 02:00:33 -03:00
kevinz000andDip f318dbe1b2 Merge pull request #10881 from Ghommie/Ghommie-cit552 2020-10-02 02:14:44 -03:00
kevinz000andDip 014bc3e026 Merge pull request #10046 from Ghommie/Ghommie-cit424 
Ports flag for bespoke elements.
 2020-10-02 00:51:46 -03:00
LinandDip ac25b449f7 Merge pull request #9856 from Ghommie/Ghommie-cit367 2020-10-02 00:49:56 -03:00
GhomandDip b433eab324 Merge pull request #10350 from Putnam3145 2020-10-01 23:04:52 -03:00
Dip 00fc2fd10b duplicate 2020-10-01 22:37:47 -03:00
kevinz000andDip 4714bd9012 initial element 2020-10-01 22:36:19 -03:00
Dip 3cd86a33c6 Radiation Update Port 2020-09-28 22:18:29 -03:00
QuoteFoxandGitHub 5881e3c728 Merge pull request #490 from ArchieBeepBoop/cluwne 
Floor cluwne doesn't exist, floor cluwne cannot-
 2020-09-28 15:35:29 +01:00
QuoteFoxandGitHub cfd822170f Merge pull request #502 from ArchieBeepBoop/hunter2 
Cursed Blood Trait (fixed)
 2020-09-27 05:35:43 +01:00
LinandDip 09cbc115b6 Medical and security records 2020-09-26 21:23:20 -03:00
QuoteFoxandGitHub 63128f684f Merge pull request #505 from ArchieBeepBoop/zlevel 
Ports Citadel Multi-Z Level fixes
 2020-09-26 23:11:47 +01:00
JaySparrow 5b079995a1 Increase Dynamic spice 
Decreases the costs of numerous events, and decreases the costs of midround antags. Adjusts injection chance. A couple other tweaks. Preps for addition of other antags.
 2020-09-26 06:08:42 -05:00
kevinz000andDip 0f750932e2 playing with fire will get me roasted 2020-09-25 13:13:29 -03:00
Dip bf11aa68dc fix 2020-09-25 11:00:36 -03:00
QuoteFox fc4c7c3bc0 Revert "Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2"" 
This reverts commit de57597599.
 2020-09-25 13:30:25 +01:00
QuoteFox 54d7544659 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-09-25 13:24:26 +01:00
QuoteFox de57597599 Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2" 
This reverts commit 2bb89753e9, reversing
changes made to 99065c9f92.
 2020-09-25 13:24:14 +01:00
DahlularandGitHub a6648fa822 Revert "Cursed Blood Trait" 2020-09-25 06:23:51 -06:00
QuoteFoxandGitHub 2bb89753e9 Merge pull request #500 from Jay-Sparrow/Dynamic2 
Dynamic2
 2020-09-25 13:13:58 +01:00
JaySparrow bb8e2a91bd Dynamic Mode for reals 
Here we go.
 2020-09-24 23:54:21 -05:00
JaySparrow 33e5ad2dec Revert "Dynamic Mode" 
Gotta remove some config files
 2020-09-24 23:52:51 -05:00