kevinz000
|
d9119d43f0
|
Merge pull request #8627 from BlackMajor/MeMapGood
Adds more space ruins.
|
2019-06-16 19:29:23 -07:00 |
|
kevinz000
|
1408a453de
|
Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
|
2019-06-16 01:16:12 -07:00 |
|
kevinz000
|
1c46bcef7e
|
Merge pull request #8479 from Ghommie/Ghommie-cit21
Krav maga leg sweep tweak.
|
2019-06-16 01:13:08 -07:00 |
|
BlackMajor
|
9219a2c813
|
Adding more ruins
|
2019-06-15 21:17:34 +12:00 |
|
BlackMajor
|
4528384976
|
Fuck it lets add way more spiciest PR
|
2019-06-15 19:03:04 +12:00 |
|
BlackMajor
|
e2ad96f4c9
|
Made a shitty space ruin robotics lab
|
2019-06-12 01:21:16 +12:00 |
|
Sishen
|
13853ac6bf
|
removes family gavel, readds briefcase
|
2019-06-10 10:16:32 -04:00 |
|
Sishen
|
400ad0b03b
|
added family gavel
|
2019-06-10 09:55:23 -04:00 |
|
Sishen
|
9f80fbe68b
|
Coloring gloves? Not on my watch!
|
2019-06-10 05:20:54 -04:00 |
|
Sishen
|
4eccc12205
|
Why are we here? Just to suffer?
|
2019-06-10 04:56:24 -04:00 |
|
Ghommie
|
cb255b8719
|
give'r or leave'r, buddy.
|
2019-06-09 06:54:26 +02:00 |
|
Ghommie
|
c3fa360270
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43
|
2019-06-09 04:50:10 +02:00 |
|
Ghommie
|
7706ec6329
|
I LOVE THE SMELL OF NAPALM IN THE MORNING!
|
2019-06-09 02:45:14 +02:00 |
|
Thalpy
|
628482e53b
|
Merge branch 'master' into FriendlyEmpathy
|
2019-06-08 23:45:37 +01:00 |
|
Ghommie
|
e1c94ef8af
|
named arguments.
|
2019-06-08 15:06:07 +02:00 |
|
Ghommie
|
ec2da508b8
|
Gonna go with 25 since it won't be usable on lying people.
|
2019-06-08 15:05:26 +02:00 |
|
kevinz000
|
aca85123be
|
Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
|
2019-06-08 01:25:37 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
kevinz000
|
3b24e05dd6
|
Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
|
2019-06-08 01:07:18 -07:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Ghommie
|
5a69499927
|
Hol up, unrelated PR time, atomization.
|
2019-06-07 01:32:15 +02:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
kevinz000
|
102d68a243
|
Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
|
2019-06-05 01:41:23 -07:00 |
|
BurgerLua
|
ed7d0575b2
|
Ass Blast USA
|
2019-06-03 14:40:57 -07:00 |
|
Ghommie
|
472d7ef8cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27
|
2019-06-02 19:03:34 +02:00 |
|
Ghommie
|
d6e54bf237
|
Fixes and updates pod's emergency suits storage.
|
2019-06-02 18:28:30 +02:00 |
|
Fermi
|
5918b026aa
|
Fixes, PLEASE CHECK HEADPATS IN MOODULAR.
|
2019-06-01 20:02:51 +01:00 |
|
Fermi
|
f8586c9699
|
Adds Friendly and empahty quirk from tg.
|
2019-06-01 18:51:25 +01:00 |
|
Trilbyspaceclone
|
0eb468e3a5
|
Update ert.dm
|
2019-05-30 11:33:38 -04:00 |
|
Ghommie
|
8fbc25ad77
|
Ports in combat gloves plus.
|
2019-05-29 16:35:56 +02:00 |
|
Ghommie
|
5309eafb59
|
Fine and be it, man.
|
2019-05-29 11:24:27 +02:00 |
|
Ghommie
|
12648720dc
|
tweakin.
|
2019-05-29 10:41:43 +02:00 |
|
Ghommie
|
fe5ac5e6e9
|
On the other hand, vehicle memes.
|
2019-05-29 09:24:12 +02:00 |
|
Ghommie
|
894b0d28e2
|
Krav maga leg sweep buff.
|
2019-05-29 08:45:45 +02:00 |
|
deathride58
|
4fc31f6322
|
Merge branch 'master' into fuckatmos
|
2019-05-25 15:34:06 -04:00 |
|
kevinz000
|
d0819246bc
|
Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
|
2019-05-25 11:30:57 -07:00 |
|
nero1024
|
732bb6575b
|
tweak footstep frequency
|
2019-05-21 14:49:15 -05:00 |
|
kevinz000
|
a9cbcdf74e
|
Merge pull request #8179 from Trilbyspaceclone/BShonker
[Ready]Makes a blue space bike horn HONK
|
2019-05-20 23:40:17 -07:00 |
|
Nero1024
|
cbdb98988c
|
fix footsteps for naga/tentacle
|
2019-05-17 20:42:54 -05:00 |
|
Nero1024
|
752f368ed2
|
Ports additional footsteps
And actually make it all compile.
|
2019-05-17 19:12:22 -05:00 |
|
Nero1024
|
2a4a656a4d
|
Port new footsteps from tg
|
2019-05-17 18:10:03 -05:00 |
|
Poojawa
|
f95da1aae5
|
Heart Attacks will murder you now
Also sanity check for cursed heart overlay
|
2019-05-17 05:59:28 -05:00 |
|
kevinz000
|
709e3375ac
|
Merge pull request #8283 from BurgerLUA/NoMoreOfThisShit
Adds a new trait that makes you immune* to Crocin and Hexacrocin
|
2019-04-30 05:28:55 -07:00 |
|
kevinz000
|
7c1d7b60d0
|
Merge pull request #8287 from Trilbyspaceclone/Lock_and_key
Lockable Collars - Requested by Frack
|
2019-04-30 05:18:14 -07:00 |
|
Useroth
|
cd5317d137
|
Fixed katana jaunt not working on dark tiles.
|
2019-04-28 15:49:00 +02:00 |
|
Trilbyspaceclone
|
33e3df8157
|
What in the hell?
|
2019-04-25 20:46:39 -04:00 |
|
Trilbyspaceclone
|
a69b845509
|
Update pockets.dm
|
2019-04-25 20:41:34 -04:00 |
|
BurgerLua
|
1f78520b68
|
Adds a new trait that makes you immune from the "positive" effects of hexacrocin and crocin.
|
2019-04-24 20:13:21 -07:00 |
|