cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,883 Commits 12 Branches 0 Tags
ee0017721e5c03daa2affef1ceadd493b37e6ef8
Commit Graph

748 Commits

Author SHA1 Message Date
Dahlular
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
Dahlular
c567887a32 Merge pull request #628 from ArchieBeepBoop/cluwnereturn 
Hard return on the cluwne if H is not the current_victim.
 2020-10-29 22:48:50 -06:00
Dahlular
5f257c785b Merge pull request #629 from BoxyBoy/sizeCodeFixStuff 
Size code examine text
 2020-10-29 22:48:08 -06:00
BoxyBoy
f508e0557b Better explanations 
Changes a couple of comments in the if/else statement to better explain what it's doing.
 2020-10-29 22:34:54 -06:00
BoxyBoy
75f967bd88 Character Size Examine Text 
Adds a line of examine text when examining a character and gives an aproximation of their height.
 2020-10-29 21:55:42 -06:00
Dip
4d64275e84 HARD return 2020-10-30 00:04:59 -03:00
Dip
9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
Dahlular
bbbd52a4a4 Merge pull request #623 from ArchieBeepBoop/numbertwo 
Ports: GetComponent macros removal, and few other updates.
 2020-10-29 10:30:33 -06:00
Dahlular
78e1327bca Merge pull request #622 from ArchieBeepBoop/grill 
Ports: The art of drunken captaining
 2020-10-29 10:28:36 -06:00
Dip
138b7a0aa0 this dullahan bullshit is going to make me kill myself 2020-10-28 16:29:53 -03:00
kevinz000
731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303 
Dullahans fixes and QoL.
 2020-10-28 16:25:19 -03:00
BlackMajor
435aa3180f Merge pull request #9649 from Thalpy/JacqFixes 
[Expedite][Halloween] Damnit Jacq stop bothering the AI
 2020-10-28 16:07:25 -03:00
kevinz000
48051d5dd2 Merge pull request #9635 from Thalpy/JacqFixes 
[Expedite] [Halloween] A few fixes for Jacqueline and Barth.
 2020-10-28 16:06:55 -03:00
kevinz000
fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2020-10-28 16:04:47 -03:00
kevinz000
82daa9b75e Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3 
Adds 8 more sci crates to cargo
 2020-10-28 05:52:11 -03:00
kevinz000
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
kevinz000
89aa5852c8 Merge pull request #9226 from Trilbyspaceclone/unmodular_2 
Unmodulars a few things + new sprite + new welder tank(unused
 2020-10-28 05:32:56 -03:00
kevinz000
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
kevinz000
4a9d6a82ce Merge pull request #9542 from Trilbyspaceclone/patch-231 
Lowers Cargo most packs down to Pre- MK I Cargo rework*
 2020-10-28 04:57:26 -03:00
kevinz000
071f1cc6af Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art 
Code stuffs + more framework for cargo rework cuz atomic prs are good
 2020-10-28 04:52:13 -03:00
kevinz000
2983dfa445 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance 
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
 2020-10-28 04:39:39 -03:00
Dip
fb7f3be4e4 icon layer 2020-10-27 16:58:33 -03:00
Dip
2ae2449f4b the pipening 2020-10-27 16:34:53 -03:00
kevinz000
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
kevinz000
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
QuoteFox
23c4a9be17 Merge pull request #617 from ArchieBeepBoop/cluwnef 
Cluwne Targeting Fix
 2020-10-27 02:37:38 +00:00
QuoteFox
1985f84ac8 Merge pull request #618 from ArchieBeepBoop/funnygenerator 
TEG Power Feedback, Runtime and Engine Weights
 2020-10-27 02:36:46 +00:00
QuoteFox
88bf85f2ea Merge pull request #619 from ArchieBeepBoop/fixesyee 
Seemingly Fixes the offset blood overlay
 2020-10-27 02:35:50 +00:00
QuoteFox
6d9b78d4e6 Merge pull request #620 from ArchieBeepBoop/penfix 
Fixes the Sleepy Pen and Missing Reagent.
 2020-10-27 02:35:32 +00:00
ToonClyde
4207015199 CitRP Fluffy Jackets 2020-10-26 14:30:59 -07:00
Dip
6abb884fa4 fixes the sleepy pen and an invalid reagent 2020-10-26 18:11:06 -03:00
deathride58
d9db5e0aa9 Merge pull request #9246 from Linzolle/taur 
some missing icons + sprite changes for taur suits
 2020-10-25 21:18:42 -03:00
Dip
72a7f68b8a good god 2020-10-25 15:47:55 -03:00
Dip
bde27f9cc6 nuclear particle runtime fix 2020-10-25 06:59:37 -03:00
Dip
30d9c6054c Goon-Like TEG Feedback & Fun 2020-10-25 06:51:56 -03:00
Dip
a6ce59ec67 floor cluwne fix 2020-10-25 02:07:55 -03:00
Dip
124bf72657 more runtimes, fixes wrong gibs and blood 2020-10-24 02:23:06 -03:00
Dip
e162b8c36f fixes invisible skellingtons 2020-10-24 00:02:45 -03:00
Dip
5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03:00
Dahlular
7aa0fccefa Merge pull request #608 from Kabramen/prosthetic-limb-quirk-revamp 
Ports selectable prostethic limbs from Yog + quirk blacklist and two o…
 2020-10-23 16:27:54 -06:00
Dahlular
3be0cb650a Merge pull request #607 from ArchieBeepBoop/becomemodular 
Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.
 2020-10-23 16:25:53 -06:00
Dahlular
d82c9304f4 Merge pull request #604 from ArchieBeepBoop/master 
[SPEEDMERGE] Fixes misaligned HE pipes & Listening Post Duplicates + TEG Burn chamber Optimizations
 2020-10-23 16:24:29 -06:00
Dip
61fad3f3de debuff carps, dormammu has not accepted bargain 2020-10-23 19:18:03 -03:00
Dip
dc0a988d6c Energy Harvester V1 2020-10-23 05:55:58 -03:00
Kabra_men
64ee851bdf Ports selectable prostethic limb from Yog + quirk blacklist and two other new quirks 2020-10-22 01:23:27 -03:00
Dip
ddcf4e1434 Adds petting element to Lia and Cayenne, alongside mob holder. 2020-10-20 03:14:45 -03:00
Dip
9d8a729c51 Ports Lia / Micro Carp Buff? 2020-10-20 02:46:13 -03:00
Dip
a479698c95 just in case this becomes a problem 2020-10-18 17:53:40 -03:00
Dip
9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dahlular
7586bd96c6 Merge pull request #601 from Chemlight/X-01_Buff 
X-01 MultiPhase Energy Gun Buff
 2020-10-18 13:24:38 -06:00