shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,825 Commits 5 Branches 0 Tags
f738e370a454ebf2988b421d90fefdfa2335fb36
Commit Graph
3471 Commits
Author SHA1 Message Date
BlackMajor 1b1ed21f42 No adrenals for borgs please 2019-11-19 22:13:22 +13:00
kevinz000andGitHub 2494ea4d07 Merge pull request #9824 from YakumoChen/YakumoChen-mariplush 
Adds Marisa plushie
 2019-11-19 01:55:59 -07:00
kevinz000andGitHub 40a01dedfe Merge pull request #9806 from BlackMajor/Yote 
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
 2019-11-19 01:54:47 -07:00
LinandGitHub c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349 
Unmodularize bikehorns and holy weapons.
 2019-11-19 03:24:38 +00:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
TrilbyspacecloneandGitHub d90812b0b2 reverts rapier nerfs 2019-11-18 06:26:25 -05:00
Ghommie 86072fe682 " 2019-11-18 04:15:33 +01:00
Ghommie deadffe96f missing parenthesis. 2019-11-18 03:26:04 +01:00
Ghommie 1c39a3bc6d Adds a few extra cardboard cutout variants. 2019-11-18 03:23:24 +01:00
TrilbyspacecloneandGitHub c575b3c798 base ball bats, katanan's and chainsaws will still fit 2019-11-17 13:54:18 -05:00
TrilbyspacecloneandGitHub 7780a14a60 rapier huge 2019-11-17 13:49:32 -05:00
KathrinBailey 05c74c731b Ports TG pew files 2019-11-17 14:20:44 +00:00
Seris02 b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08:00
YakumoChenandGitHub 5c89447cf9 Update plushes.dm 2019-11-16 09:56:57 +00:00
GrayRachnid 3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
Ghommie c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
Ghommie f401e622c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-15 01:01:08 +01:00
Ghommie 5bb6247a6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349 2019-11-15 00:57:38 +01:00
kevinz000andGitHub 02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 
Ports techweb backend refactor & co.
 2019-11-14 16:45:09 -07:00
kevinz000andGitHub d5a245945c Merge pull request #9742 from Seris02/gpsthing 
makes gps show location on examine
 2019-11-14 16:44:40 -07:00
kevinz000andGitHub ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350 
Ports Improved beach away mission and some fluff mapping items.
 2019-11-14 16:36:19 -07:00
kevinz000andGitHub 8c247a566a Merge pull request #9783 from Ghommie/Ghommie-cit343 
Fixing Aux base camera RCD door settings and toggle window type actions.
 2019-11-14 16:22:08 -07:00
kevinz000andGitHub 4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
kevinz000andGitHub 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000andGitHub 2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000andGitHub 8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306 
Fixing gibspawner runtimes and improving them, how gruesome...
 2019-11-14 15:51:20 -07:00
kevinz000andGitHub d8e89b235f Merge pull request #9689 from Ghommie/Ghommie-cit307 
How many times I have encountered this sort of issue in the past and how much of a meme it was...
 2019-11-14 15:50:52 -07:00
kevinz000andGitHub af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
kevinz000andGitHub dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220 
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
 2019-11-14 15:44:59 -07:00
Ghommie 322c90fab2 Mistake I have done when copypasting. 2019-11-14 13:32:57 +01:00
kevinz000andGitHub 487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340 
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
 2019-11-14 01:40:16 -07:00
kevinz000andGitHub 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 2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01: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
kevinz000andGitHub 4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331 
lentext to length, yet another 513 requirement.
 2019-11-12 23:59:31 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 8920930679 Merge pull request #9765 from dapnee/let's-fix-lockers 
Ports Closet & Crate Initialization Fixes
 2019-11-12 23:57:39 -07:00
kevinz000andGitHub 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
Ghommie 4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +01: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