Putnam3145
|
37cfec22aa
|
Merge pull request #10066 from Sishen1542/aaaaaaaa
neovgre qol changes
|
2019-12-17 11:40:43 -08:00 |
|
Useroth
|
8151a1f3ff
|
Merged master into this branch.
|
2019-12-16 12:06:30 +01:00 |
|
BlackMajor
|
74cc1ec547
|
Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
|
2019-12-16 14:14:35 +13:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
BlackMajor
|
59d0376985
|
finished
|
2019-12-14 17:31:26 +13:00 |
|
KeRSe
|
e31455667e
|
New delta alert sound
|
2019-12-10 00:05:59 -05:00 |
|
Useroth
|
5e836c51e4
|
Forgot to track the new files
|
2019-12-08 14:05:05 +01:00 |
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
Sishen
|
8da7d1a021
|
b
|
2019-12-06 06:38:48 -07:00 |
|
Ghommie
|
8615c0ea8f
|
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
|
2019-12-03 02:32:59 +01:00 |
|
Artur
|
f48d8016d5
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-01 13:51:57 +02:00 |
|
Artur
|
02048ce009
|
Bludsuckers
|
2019-11-29 21:28:14 +02:00 |
|
Ghommie
|
4e05c27cdb
|
Updating supply pods code.
|
2019-11-27 01:54:10 +01:00 |
|
Ghommie
|
d6d830b2ec
|
Morgues no longer go "ammunition depleted"
|
2019-11-26 22:20:52 +01:00 |
|
dzahlus
|
8ab67ccf49
|
what does this button do
|
2019-11-20 01:34:26 +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 |
|
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
|
4eca1ca5ad
|
Merge pull request #9605 from Ghommie/Ghommie-cit269
Unmodularize vox sounds
|
2019-10-25 20:09:52 -07:00 |
|
kevinz000
|
9096f03ad3
|
Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
|
2019-10-24 19:07:33 -07:00 |
|
Ghommie
|
0da6ae549f
|
Unmodularize vox sounds
|
2019-10-24 23:02:21 +02:00 |
|
deathride58
|
68813b6846
|
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
|
2019-10-22 19:14:12 -04:00 |
|
deathride58
|
ee0357b2c4
|
Merge pull request #9214 from Sishen1542/mechshit
properly ports neovgre from hippie
|
2019-10-21 21:17:57 -04:00 |
|
YakumoChen
|
37481b681a
|
Delete gatling.ogg
|
2019-10-20 03:10:36 +00:00 |
|
kevinz000
|
a7a238eafd
|
Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
|
2019-10-17 12:48:01 -07:00 |
|
Poojawa
|
49ee9af897
|
metadata because people are throwing a fit about it
|
2019-10-17 01:30:47 -05:00 |
|
deathride58
|
b3a81dce01
|
Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs
|
2019-10-14 18:18:32 -04:00 |
|
Fermi
|
7bce68bb11
|
Merge branch 'master' into Spookytime
|
2019-10-11 21:51:48 +01:00 |
|
Ghommie
|
31a6979c3c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-10-06 21:54:15 +02:00 |
|
Fermi
|
797dcfc1e3
|
ahaha
|
2019-10-02 10:08:45 +01:00 |
|
Sishen
|
f3d373a6b8
|
loose goose
honk honk
|
2019-10-02 02:27:30 -04:00 |
|
kevinz000
|
6e55fec7bd
|
Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
|
2019-09-28 00:40:02 -07:00 |
|
Fermi
|
0dcdede8fa
|
In response to poll and feedback.
|
2019-09-22 02:28:59 +01:00 |
|
Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04:00 |
|
nik707
|
0a4090f4d3
|
Merge pull request #9080 from Thalpy/Newmusic
Adds 3 new Copyright compatible space-y music tracks to title
|
2019-08-29 18:23:47 -05:00 |
|
Sishen
|
b98a5016b3
|
aaaaaaaaaaaa
|
2019-08-29 01:56:52 -04:00 |
|
Ghommie
|
f843a53fe9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-08-24 12:52:16 +02:00 |
|
Sishen
|
20f4e260e1
|
minigun ooga
|
2019-08-23 19:39:20 -04:00 |
|
Fermi
|
5764041835
|
Adds new title music!
|
2019-08-08 17:25:40 +01:00 |
|
Ghommie
|
23e3263fcb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-08-08 04:46:54 +02:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
EgoSumStultus
|
54f10b780c
|
HHUUUUHGHUGHUGHGH!!
|
2019-08-02 07:35:59 -07:00 |
|
Ghommie
|
72413c893f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-07-27 01:38:20 +02:00 |
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
Ghommie
|
589cdae0e1
|
Towels
|
2019-07-18 00:03:49 +02:00 |
|
Ghommie
|
16a7f6e5b2
|
Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54
|
2019-07-15 17:46:13 +02:00 |
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
kevinz000
|
1b4df74efb
|
Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
|
2019-07-07 02:39:07 -07:00 |
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|