 kevinz000
|
3a8e9da73b
|
Fixes projectiles going sanic (#12167)
* ok
* woops
|
2020-05-09 01:27:26 +02:00 |
|
|
Detective Google
|
35566b5795
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-08 18:21:57 -05:00 |
|
|
Ghommie
|
364ca3fdf2
|
There is more!
|
2020-05-09 01:14:29 +02:00 |
|
|
Ghommie
|
88d86e53d0
|
Porting some radial menu updates, and that one clown mask.
|
2020-05-09 00:45:48 +02:00 |
|
|
Suicidalpickles
|
2d9aac8f31
|
cakehat cat wearing a cakehat while patting a cak (#12166)
fix
|
2020-05-09 00:40:07 +02:00 |
|
|
kevinz000
|
1872f556ac
|
woops
|
2020-05-08 15:09:02 -07:00 |
|
|
kevinz000
|
afa006d280
|
ok
|
2020-05-08 15:02:38 -07:00 |
|
|
Lin
|
ab8342d453
|
Merge pull request #12141 from Trilbyspaceclone/patch-367
Corrects medical packet crafting
|
2020-05-08 21:27:43 +00:00 |
|
|
Ghommie
|
2858ddd90b
|
Porting "Refactors language holder"
|
2020-05-08 22:44:02 +02:00 |
|
|
Ghom
|
97c5eb9b8f
|
Fixing chargers not putting the item in hands
|
2020-05-08 22:20:54 +02:00 |
|
|
Ghom
|
2650df11d5
|
Update riding.dm
|
2020-05-08 22:12:27 +02:00 |
|
|
Trilbyspaceclone
|
43f6acd81b
|
*crys*
|
2020-05-08 15:42:35 -04:00 |
|
|
Trilbyspaceclone
|
a711f312ce
|
Update mecha_construction_paths.dm
|
2020-05-08 15:37:17 -04:00 |
|
|
Trilbyspaceclone
|
c9f8f55945
|
Update mecha_construction_paths.dm
|
2020-05-08 15:29:20 -04:00 |
|
|
Trilbyspaceclone
|
e0d56363d4
|
Update mecha_construction_paths.dm
|
2020-05-08 15:13:13 -04:00 |
|
|
Trilbyspaceclone
|
5ab1d04154
|
Update mecha_construction_paths.dm
|
2020-05-08 14:44:27 -04:00 |
|
|
Trilbyspaceclone
|
9caa236e85
|
Update mecha_construction_paths.dm
|
2020-05-08 14:22:15 -04:00 |
|
|
Ghommie
|
ffd5dd9615
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
|
2020-05-08 19:01:28 +02:00 |
|
|
Ghommie
|
a412e840f7
|
'mob_run_block' and 'mob_check_block' macros
|
2020-05-08 18:52:32 +02:00 |
|
|
Linzolle
|
24da94720b
|
cold res
|
2020-05-08 11:51:24 -05:00 |
|
|
Artur
|
ccae3aebd5
|
Trying to get the sleeper and clockworkslab to work
|
2020-05-08 19:50:49 +03:00 |
|
|
TrilbySpaceClone
|
47319cc8c9
|
What if mechs give more information?
|
2020-05-08 11:28:39 -04:00 |
|
|
Ghommie
|
90bf157f5e
|
Fixing some runtimes and issues.
|
2020-05-08 17:17:33 +02:00 |
|
|
Ghom
|
73d958649e
|
Update item_attack.dm
|
2020-05-08 17:12:13 +02:00 |
|
|
Ghom
|
7616887604
|
Update mood.dm
|
2020-05-08 16:13:57 +02:00 |
|
|
Putnam3145
|
602154abe8
|
Fixes cloner sabotage to only check on station Z (#12140)
|
2020-05-08 15:48:23 +02:00 |
|
|
kevinz000
|
ee97ac8132
|
ok
|
2020-05-08 04:32:57 -07:00 |
|
|
kevinz000
|
77848bd90f
|
tgs folder
|
2020-05-08 04:30:51 -07:00 |
|
|
Trilbyspaceclone
|
1472ea31a0
|
oops all the missing commas
|
2020-05-08 07:19:03 -04:00 |
|
|
Trilbyspaceclone
|
b5010c5cfc
|
Update machine_vending.dm
|
2020-05-08 06:49:26 -04:00 |
|
|
Trilbyspaceclone
|
a6bf258f5c
|
Update ice_demon.dm
|
2020-05-08 04:33:40 -04:00 |
|
|
kevinz000
|
61692f290a
|
Merge pull request #12121 from Ghommie/Ghommie-cit723
Generic skills support for items, level based skill type. Wiring skill.
|
2020-05-08 01:24:44 -07:00 |
|
|
Detective Google
|
4e84b92e2e
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-08 01:13:12 -05:00 |
|
|
kevinz000
|
43dc1319d9
|
Merge pull request #12097 from Ghommie/Ghommie-cit720
Implementing the NO_PUBLIC_LATHE build_type flag.
|
2020-05-07 21:04:57 -07:00 |
|
|
Lin
|
ae3b2a58f9
|
Merge pull request #12129 from Ghommie/Ghommie-cit726
Fixing some sprite issues and nit-picks.
|
2020-05-08 03:00:20 +00:00 |
|
|
Ghommie
|
aaa31c24ce
|
Demodularizing a few sprite assets.
|
2020-05-08 04:02:31 +02:00 |
|
|
kevinz000
|
51081fcb1a
|
ok (#12083)
|
2020-05-08 03:36:08 +02:00 |
|
|
Ghommie
|
192c0dcc1a
|
Demodularizing the arousal module.
|
2020-05-08 03:35:29 +02:00 |
|
|
Ghommie
|
3dfef3c393
|
.
|
2020-05-08 02:50:14 +02:00 |
|
|
Ghommie
|
4041fce0f7
|
whops.
|
2020-05-08 02:30:57 +02:00 |
|
|
Ghommie
|
ddb50e2845
|
colors.
|
2020-05-08 02:24:49 +02:00 |
|
|
Ghommie
|
835753a02d
|
!
|
2020-05-08 02:14:07 +02:00 |
|
|
Ghommie
|
60bdbfaf61
|
Merge conflicts, procs instead of macros, mood signals.
|
2020-05-08 02:12:41 +02:00 |
|
|
Trilbyspaceclone
|
80687bb17f
|
Update recipes_misc.dm
|
2020-05-07 18:00:50 -04:00 |
|
|
Trilbyspaceclone
|
86fc39a777
|
le sigh
|
2020-05-07 17:55:25 -04:00 |
|
|
Ghommie
|
74e7f7ea46
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit726
|
2020-05-07 22:14:11 +02:00 |
|
|
Ghommie
|
3914c1bd65
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit727
|
2020-05-07 21:41:47 +02:00 |
|
|
kevinz000
|
9c08df761f
|
fixes
|
2020-05-07 11:50:38 -07:00 |
|
|
kevinz000
|
05068f80db
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-07 10:57:10 -07:00 |
|
|
kevinz000
|
2a33060c98
|
Update world.dm
|
2020-05-07 10:44:45 -07:00 |
|