shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

3511 Commits

Author SHA1 Message Date
kevinz000 3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
BlackMajor 0c33757b14 Fixes a few bugs 2019-11-14 18:54:57 +13:00
BlackMajor ce94da9ed3 Merge branch 'master' into Yote 2019-11-14 17:37:57 +13:00
BlackMajor b9a7685830 Adds dogborg catch for doggos and some 2019-11-14 17:14:14 +13:00
Ghommie aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Ghommie 3ce4ef8e27 f 2019-11-13 21:17:40 +01:00
Ghommie cef72b93eb The files. 2019-11-13 20:35:21 +01:00
Ghommie 248586cfd7 Unmodularize bikehorns and holy weapons. 2019-11-13 20:28:19 +01:00
TrilbySpaceClone ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05:00
kevinz000 e142ed03dd Merge pull request #9773 from Ghommie/Ghommie-cit339 
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
 2019-11-12 23:58:15 -07:00
kevinz000 a16219d97a Merge pull request #9772 from DeltaFire15/weh 
Adds eight new plushies to the game while integrating kevs' plush PR
 2019-11-12 23:56:01 -07:00
DeltaFire 4d4d495765 Hmm I wonder if anyone would notice if I smuggled another plush into this PR 
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
 2019-11-12 15:32:06 +01:00
Ghommie aad2b5bcd5 Fixing Aux base camera/drone RCD actions. 2019-11-12 04:35:10 +01:00
Ghommie e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie d06b6fd83e Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) 2019-11-11 21:34:47 +01:00
DeltaFire 421be859fb Ok nice typo gang 2019-11-11 21:08:32 +01:00
DeltaFire 51aacedb9f Little fix 2019-11-11 18:17:07 +01:00
DeltaFire 3d2986fd06 Fixes the sin plush sprite + MORE PLUSHIES 
What it says on the label, fixes the sin plushie sprite as the size was wrong previously and adds two more lizzers

Also fixes a typo weh
 2019-11-11 17:32:06 +01:00
Ghommie 63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
TrilbySpaceClone 6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
BlackMajor 4cd741310b Borg changes and module compression 2019-11-11 16:35:20 +13:00
Lin df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00:00
DeltaFire 1c6c188033 Exo plush 
Adds a AI plushie for exo since this PR is slowly getting filled with plushies
guaranteered non-malf!
 2019-11-11 01:05:16 +01:00
Ghommie 09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
DeltaFire 56720ea99c Merging kevinz's plush PR into mine 
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
 2019-11-10 22:27:06 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000 92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311 
Unmodularize and update pAI/Intellicards very slighty.
 2019-11-10 11:40:14 -07:00
kevinz000 e8219dd9f7 Merge pull request #9697 from Poojawa/patch-1 
Better Health Analyzer formatting
 2019-11-10 11:35:07 -07:00
kevinz000 487e1806e7 Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3 
Adds 8 more sci crates to cargo
 2019-11-10 11:30:33 -07:00
kevinz000 501dfbb43a Merge pull request #9715 from Ghommie/Ghommie-cit316 
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
 2019-11-10 11:27:36 -07:00
kevinz000 c46b425402 Merge pull request #9719 from Ghommie/Ghommie-cit318 
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
 2019-11-10 11:26:06 -07:00
DeltaFire 7ab4d2f013 Viva la wehvolution 
Adding the plushies code after syncing with ros's changes
 2019-11-10 17:39:43 +01:00
Seris02 8dfbc652cb ADDS THE NEW MARTIAL ART - RISING BASS!! 2019-11-09 21:11:36 +08:00
Trilbyspaceclone 96a8302dac Fine you can boh bomb again 2019-11-08 21:11:44 -05:00
Trilbyspaceclone 5e1ab01733 What do you mean I cant hold the armory on my back? 
But mmmmmuuuummmm I want to have 12 duffle bags in my bag of holding!!!
 2019-11-08 21:05:30 -05:00
Ghommie 298f2e02c6 Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron. 2019-11-08 22:33:26 +01:00
Seris02 6dc3fca905 makes gps show location on examine 2019-11-08 19:24:54 +08:00
TrilbySpaceClone 0662245d80 corrections 2019-11-06 22:52:44 -05:00
Ghommie 892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
rosko cc8423ac45 adds a lizzard plushie 
yet another player plushie....this one comes with a real fake maxcap
 2019-11-05 20:38:44 +02:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie 29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Ghommie 1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01:00
TrilbySpaceClone 526d9b203c aliens 
man
 2019-11-04 00:34:03 -05:00
TrilbySpaceClone 82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
Trilbyspaceclone 9af899c9c3 cleaning up 2019-11-03 12:59:41 -05:00
TrilbySpaceClone 5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
kevinz000 6462d0c8c8 Merge pull request #9658 from Ghommie/Ghommie-cit291 
Fixing dogborg sleepers runtimes, how atrocious...
 2019-11-03 06:20:30 -07:00
kevinz000 3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302 
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
 2019-11-03 06:14:13 -07:00