Trilbyspaceclone
|
3418fe1541
|
Update weaponry.dm
|
2020-04-22 17:32:35 -04:00 |
|
Ghommie
|
63870cc9d1
|
Movespeed modifiers refactor port.
|
2020-04-22 22:01:39 +02:00 |
|
kevinz000
|
fe63eca817
|
kay
|
2020-04-22 11:04:01 -07:00 |
|
kevinz000
|
c551006295
|
catch dropped
|
2020-04-22 10:54:42 -07:00 |
|
kevinz000
|
3626cc5d28
|
okay
|
2020-04-22 10:50:03 -07:00 |
|
kevinz000
|
467497af54
|
woops
|
2020-04-22 10:45:13 -07:00 |
|
kevinz000
|
3e09ee8328
|
Alright
|
2020-04-22 10:42:11 -07:00 |
|
Trilbyspaceclone
|
71e91a15b1
|
toxin healing bad I guess
|
2020-04-22 02:19:35 -04:00 |
|
Lin
|
4c83af2cc2
|
Merge pull request #11953 from kevinz000/shieldbash2
Fixes shield bashing
|
2020-04-22 01:51:57 +00:00 |
|
Ghommie
|
e9bf432a0d
|
Scavenging element.
|
2020-04-22 03:30:40 +02:00 |
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
Ghommie
|
1659e2804e
|
Deletes lots of autoylathe copypasta.
|
2020-04-21 04:04:10 +02:00 |
|
Ghommie
|
c93f028a97
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-21 01:53:41 +02:00 |
|
Ghommie
|
e0d219650f
|
Ready for testing.
|
2020-04-21 01:26:34 +02:00 |
|
Trilbyspaceclone
|
e769d28a2d
|
Update weaponry.dm
|
2020-04-20 18:47:18 -04:00 |
|
Ghom
|
50eae569eb
|
Merge pull request #11940 from Detective-Google/null-roddies
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-20 23:53:24 +02:00 |
|
kevinz000
|
3e9b1a6875
|
Update shields.dm
|
2020-04-20 14:02:39 -07:00 |
|
Trilbyspaceclone
|
ec9b0573aa
|
even reagents
|
2020-04-20 15:45:37 -04:00 |
|
kevinz000
|
7e2a54d5d6
|
fix
|
2020-04-20 12:30:20 -07:00 |
|
kevinz000
|
6428f4a0c2
|
ok
|
2020-04-20 12:18:09 -07:00 |
|
kevinz000
|
90f6904f44
|
fix
|
2020-04-20 12:16:42 -07:00 |
|
kevinz000
|
85fcdbf673
|
Merge pull request #11916 from Trilbyspaceclone/crafting_menu
Cleans up misc tab in the crafting menu
|
2020-04-20 11:37:13 -07:00 |
|
kevinz000
|
ff651ac881
|
Merge pull request #11931 from Ghommie/Ghommie-cit694
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-20 11:31:31 -07:00 |
|
Ghom
|
9df0982da3
|
Update mirror.dm
|
2020-04-20 17:57:08 +02:00 |
|
Trilbyspaceclone
|
6fcec77e9b
|
Update shields.dm
|
2020-04-19 23:18:17 -04:00 |
|
kiwedespars
|
842483190a
|
Update code/game/objects/items/storage/uplink_kits.dm
my brain is small when working git.
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
|
2020-04-19 17:18:14 -07:00 |
|
kiwedespars
|
b21ee932cf
|
maybe this is travis's issue?
|
2020-04-19 17:06:21 -07:00 |
|
kiwedespars
|
42fac43807
|
Merge branch 'master' into punch-bundle
|
2020-04-19 16:50:01 -07:00 |
|
kiwedespars
|
25e0c47225
|
oops
|
2020-04-19 16:48:37 -07:00 |
|
kevinz000
|
ae27bf90e4
|
Merge pull request #11846 from Putnam3145/vore-optimization
Optimizing vore + commenting out simplemob vore (sorry)
|
2020-04-19 16:45:44 -07:00 |
|
TrilbySpaceClone
|
25b1b889dc
|
amazing truely amazing
|
2020-04-19 19:09:20 -04:00 |
|
kiwedespars
|
c3905c8c2b
|
Update uplink_kits.dm
|
2020-04-19 15:56:31 -07:00 |
|
Detective Google
|
0c2f0a99d5
|
fixes the fact that some citadel null rods aren't null rod subtypes
|
2020-04-19 17:18:40 -05:00 |
|
Detective Google
|
5376ca81b5
|
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-19 16:57:02 -05:00 |
|
CitadelStationBot
|
22dd41925f
|
Merge pull request #11937 from Citadel-Station-13/Ghommie-patch-3
Fixing critter crates having an invalid icon state when opened.
|
2020-04-19 15:11:28 -05:00 |
|
TrilbySpaceClone
|
37a0fb558c
|
with fixes and new gauze
|
2020-04-19 15:29:48 -04:00 |
|
Lin
|
d75e3f79bd
|
Merge pull request #11917 from Ghommie/Ghommie-cit688
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-19 16:52:33 +00:00 |
|
Ghom
|
8551998833
|
Update critter.dm
|
2020-04-19 14:07:13 +02:00 |
|
Trilbyspaceclone
|
2039fb80e6
|
Update fancy.dm
|
2020-04-18 22:37:05 -04:00 |
|
kevinz000
|
5fd862e19d
|
Merge pull request #11860 from Trilbyspaceclone/shields!
Adds more shields and tweaks a few!
|
2020-04-18 19:32:09 -07:00 |
|
Ghommie
|
d5a43be181
|
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-19 03:07:45 +02:00 |
|
Ghom
|
6e62f7a2a3
|
Merge pull request #11878 from Arturlang/fixes_zipties_being_red
Makes zipties white again
|
2020-04-19 02:45:31 +02:00 |
|
Trilbyspaceclone
|
efdab85261
|
Update crayons.dm
|
2020-04-18 17:10:31 -04:00 |
|
TrilbySpaceClone
|
8ca7bb7535
|
Right...
|
2020-04-18 09:46:56 -04:00 |
|
Ghommie
|
8d4a67fedc
|
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-18 15:40:18 +02:00 |
|
Trilbyspaceclone
|
d26ba86660
|
Update shields.dm
|
2020-04-17 23:30:58 -04:00 |
|
Putnam
|
33039f9962
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization
|
2020-04-17 18:56:26 -07:00 |
|
Ghommie
|
96b64009d0
|
Oh, nullspace.
|
2020-04-18 03:44:49 +02:00 |
|
Trilbyspaceclone
|
7756a80beb
|
Merge branch 'master' into shields!
|
2020-04-17 19:32:39 -04:00 |
|
Lin
|
7cc7d6884a
|
Merge pull request #11820 from kevinz000/shield_bashing
Shield bashing
|
2020-04-17 20:45:40 +00:00 |
|