shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,055 Commits 5 Branches 0 Tags
e7523862ebbe19ced56cd60402eb7ea287923bce
Commit Graph

1376 Commits

Author SHA1 Message Date
Winter Flare
e7523862eb Added Newspaperr to Loadout 2019-11-25 06:02:50 -05:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
kevinz000
9e5f697838 Merge pull request #9842 from NopemanMcHalt/dab-op-plus 
Fixes D.A.B. loadout name
 2019-11-19 21:31:47 -07:00
kevinz000
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
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo 
For "recruitment" on-station.
 2019-11-17 15:08:30 +03:00
kevinz000
40523802f3 Merge pull request #9804 from Ghommie/Ghommie-cit351 
Unmodularize keybindings.
 2019-11-14 16:36:55 -07:00
kevinz000
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
kevinz000
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
kevinz000
617b0db310 Merge pull request #9692 from Ghommie/Ghommie-cit309 
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
 2019-11-14 15:48:34 -07:00
kevinz000
d1ea2d9990 Merge pull request #9554 from NopemanMcHalt/assu 
[READY] Desperate Assistance Battleforce
 2019-11-14 15:43:51 -07:00
Ghommie
358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
kevinz000
f1612f6619 Merge pull request #9791 from kappa-sama/revolverports 
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
 2019-11-14 01:39:21 -07: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
2f1a76c21e Unmodularize keybindings. 2019-11-13 23:57:49 +01:00
kappa-sama
c9c7d3e64e begone 2019-11-13 16:46:13 -05:00
TrilbySpaceClone
73661cfe52 more fixing+ chem selling tweaks 2019-11-13 09:39:42 -05:00
Anonymous
837052740a Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
 2019-11-13 11:59:53 +03:00
BlackMajor
4cd741310b Borg changes and module compression 2019-11-11 16:35:20 +13: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
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
d9fd6cd176 Merge pull request #9735 from Ghommie/Ghommie-cit325 
Unmodularizing 2/3 of the sounds folder.
 2019-11-10 11:45:28 -07:00
kevinz000
9102cd3b3d Merge pull request #9717 from Putnam3145/sdgf-notes 
Makes SDGF transfer notes/memories.
 2019-11-10 11:26:34 -07:00
kevinz000
4fc10d436d Merge pull request #9721 from Ghommie/Ghommie-cit319 
Unmodularize secway and turfs
 2019-11-10 11:25:50 -07:00
Ghommie
d575bb5442 I should have just run a replace text to start with.. 2019-11-07 00:59:24 +01:00
Ghommie
d48f1aad8a Yea, moving a few of them to voices. Do you vocalize? 2019-11-07 00:48:56 +01:00
Ghommie
3a9e4c1f13 Unmodularizing 2/3 of the sounds folder. 2019-11-06 23:11:15 +01:00
nik707
12a69dcee5 Merge pull request #9574 from r4d6/patch-4 
Add departemental Winter Coats to loadout
 2019-11-05 13:52:48 -06:00
Ghommie
9cac543a2b Unmodularize secway and turfs 2019-11-05 05:47:25 +01:00
Putnam
b0b3c24aab makes SDGF transfer notes/memories. 2019-11-04 16:12:52 -08: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
r4d6
0114b7fbe2 Comment out Sec coat 2019-11-03 16:51:07 -05:00
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Anonymous
537ac0f6ca Merge branch 'master' into assu 2019-11-01 19:05:53 +03:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Anonymous
5930389cb6 Merge branch 'master' into assu 2019-10-30 15:18:39 +03:00
kevinz000
b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs 
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
 2019-10-29 21:29:12 -07:00
kevinz000
bc3dd51db3 Merge pull request #9626 from Ghommie/Ghommie-cit278 
Unmodularize space kiwis and banana spiders.
 2019-10-29 21:21:14 -07:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Anonymous
ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
BlackMajor
6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again 
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
 2019-10-28 16:47:02 +13:00
deathride58
2c017b1f86 Merge pull request #9633 from Citadel-Station-13/onionneck 
onion necklace
 2019-10-27 20:43:01 -04:00
Jay
9d830610bb onion necklace 2019-10-27 11:52:38 -05:00
Ghommie
bf92aa2ffb Unmodularize MkII hyposprays and other reagent items sprites. 2019-10-26 19:14:28 +02:00
Ghommie
c0130467db Unmodularize space kiwis and banana spiders. 2019-10-26 18:15:02 +02:00
Anonymous
11ff7802bb Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2019-10-26 18:06:56 +03:00
deathride58
be4d694080 Merge pull request #9329 from Citadel-Station-13/kevinz000-patch-87 
makes sprinting take more stamina when buffer is empty to compensate for added regen
 2019-10-25 23:15:11 -04:00
kevinz000
49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
kevinz000
275ecbf468 Merge pull request #9604 from Ghommie/Ghommie-cit268 
Unmodularize job types
 2019-10-25 20:10:39 -07:00