 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 |
|
|
kevinz000
|
02e8a73265
|
Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
|
2019-11-14 16:45:09 -07:00 |
|
|
kevinz000
|
40523802f3
|
Merge pull request #9804 from Ghommie/Ghommie-cit351
Unmodularize keybindings.
|
2019-11-14 16:36:55 -07:00 |
|
|
kevinz000
|
d6f540faf7
|
Merge pull request #9796 from Ghommie/Ghommie-cit347
Unmodularize airlocks.
|
2019-11-14 16:24:56 -07:00 |
|
|
kevinz000
|
bd650e53da
|
Merge pull request #9795 from Ghommie/Ghommie-cit346
Unmodularize areas.
|
2019-11-14 16:24:36 -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
|
09e5cd95a3
|
Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-14 15:50:20 -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 |
|
|
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 |
|
|
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 |
|
|
Ghommie
|
b83f92be0e
|
Unmodularize airlocks.
|
2019-11-13 06:50:35 +01:00 |
|
|
Ghommie
|
f55a602319
|
Unmodularize areas.
|
2019-11-13 06:13:18 +01:00 |
|
|
Ghommie
|
63da5ffb13
|
ID console fixes and other tweaks.
|
2019-11-11 17:10:14 +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 |
|
|
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
|
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
|
9102cd3b3d
|
Merge pull request #9717 from Putnam3145/sdgf-notes
Makes SDGF transfer notes/memories.
|
2019-11-10 11:26:34 -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 |
|
|
kevinz000
|
4fc10d436d
|
Merge pull request #9721 from Ghommie/Ghommie-cit319
Unmodularize secway and turfs
|
2019-11-10 11:25:50 -07:00 |
|
|
Ghommie
|
b2b1390bd3
|
Ports techweb backend refactor & co.
|
2019-11-07 05:07:38 +01: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 |
|
|
Anonymous
|
0849ea365f
|
Merge branch 'master' into assu
|
2019-11-05 15:45:04 +03:00 |
|
|
Ghommie
|
9cac543a2b
|
Unmodularize secway and turfs
|
2019-11-05 05:47:25 +01:00 |
|
|
Ghommie
|
a650e1e411
|
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
|
2019-11-05 05:37:28 +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 |
|
|
kevinz000
|
0615189629
|
Merge pull request #9665 from Ghommie/Ghommie-cit295
Removing references to national socialism
|
2019-11-03 06:18:47 -07:00 |
|
|
Ghommie
|
7e4aef46d9
|
Unmodularize and update pAI/Intellicards very slighty.
|
2019-11-03 04:23:31 +01:00 |
|
|
Ghommie
|
592d1a4b54
|
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
|
2019-11-03 01:55:59 +01:00 |
|
|
Ghommie
|
100a87d57b
|
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-02 20:42:01 +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
|
6dc6159f4a
|
Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
|
2019-10-29 21:42:32 -07: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
|
ae4aee794e
|
Merge pull request #9592 from Ghommie/Ghommie-cit262
Porting movespeed modification system updates.
|
2019-10-29 21:27:53 -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
|
005c87bdf6
|
I'm making a joke title, don't ban me github.
|
2019-10-30 01:31:29 +01:00 |
|
|
Anonymous
|
23202e8524
|
Merge branch 'master' into assu
|
2019-10-29 17:53:16 +03:00 |
|