kevinz000
|
464fcd02cd
|
Merge remote-tracking branch 'citadel/master' into skills
|
2020-04-25 22:18:08 -07:00 |
|
kevinz000
|
e54ba579d0
|
Update silicon_defense.dm
|
2020-04-25 20:52:27 -07:00 |
|
TrilbySpaceClone
|
1740531432
|
it just complies
|
2020-04-25 23:23:42 -04:00 |
|
kevinz000
|
d7f38faab9
|
Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
|
2020-04-25 17:05:38 -07:00 |
|
kevinz000
|
d9b6ea5181
|
Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
|
2020-04-25 16:59:07 -07:00 |
|
kevinz000
|
0dc259a985
|
Merge pull request #11990 from Trilbyspaceclone/patch-357
Test merge maybe - Buffs space vines
|
2020-04-25 16:54:47 -07:00 |
|
kevinz000
|
da61b04ed0
|
Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
|
2020-04-25 16:53:48 -07:00 |
|
kevinz000
|
4689e2aeb6
|
Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
|
2020-04-25 16:51:14 -07:00 |
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
Ghommie
|
8440b48a9a
|
organ/on_life tweaks.
|
2020-04-25 16:19:43 +02:00 |
|
kevinz000
|
e6b0fb4929
|
this was a mistake
|
2020-04-25 01:02:47 -07:00 |
|
kevinz000
|
abb7f199df
|
tweaks
|
2020-04-24 23:39:08 -07:00 |
|
kevinz000
|
62fd71c50e
|
kay
|
2020-04-24 23:31:34 -07:00 |
|
kevinz000
|
07dedea81a
|
Merge remote-tracking branch 'citadel/master' into typing_indicators
|
2020-04-24 22:49:54 -07:00 |
|
Ghom
|
5ccdc55e42
|
Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
|
2020-04-25 02:47:28 +02:00 |
|
Putnam
|
95d1a25df7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller
|
2020-04-24 16:07:38 -07:00 |
|
Ghommie
|
e0a51903a1
|
Not yet implemented design security level requirements.
|
2020-04-24 00:51:04 +02:00 |
|
Trilbyspaceclone
|
83ba5c1b9b
|
Update venus_human_trap.dm
|
2020-04-23 16:52:24 -04:00 |
|
kevinz000
|
1e515b89f9
|
Update mob_movement.dm
|
2020-04-23 11:33:10 -07:00 |
|
Artur
|
f97f264fb7
|
Fixing more stuff
Mint machine compile fixes and the syndicate contractor program.
|
2020-04-23 20:09:42 +03:00 |
|
Ghommie
|
b5abfd9273
|
thank you dreamchecker.
|
2020-04-23 14:49:05 +02:00 |
|
Artur
|
321902c35a
|
Ports https://github.com/tgstation/tgstation/pull/50225
|
2020-04-23 13:28:09 +03:00 |
|
TrilbySpaceClone
|
7761990919
|
soooo this complies but does it work?
|
2020-04-23 03:13:07 -04:00 |
|
Artur
|
80b47ec1c0
|
Ports https://github.com/tgstation/tgstation/pull/50497
|
2020-04-23 09:55:28 +03:00 |
|
TrilbySpaceClone
|
86abfefa1b
|
still dosnt work
|
2020-04-23 02:52:07 -04:00 |
|
kevinz000
|
b398e65416
|
Update mob_movement.dm
|
2020-04-22 22:46:42 -07:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Lin
|
7f271157c3
|
Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
|
2020-04-22 20:33:12 +00:00 |
|
Ghommie
|
63f5e101a2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700
|
2020-04-22 22:30:10 +02:00 |
|
Ghommie
|
63870cc9d1
|
Movespeed modifiers refactor port.
|
2020-04-22 22:01:39 +02:00 |
|
kevinz000
|
c551006295
|
catch dropped
|
2020-04-22 10:54:42 -07:00 |
|
Lin
|
df4452468a
|
Merge pull request #11932 from Ghommie/Ghommie-cit695
Some mispelled filepaths.
|
2020-04-22 16:09:33 +00:00 |
|
kevinz000
|
5c17902628
|
compile
|
2020-04-22 08:50:51 -07:00 |
|
kevinz000
|
5984fa02b8
|
more changes
|
2020-04-22 08:49:21 -07:00 |
|
kevinz000
|
d259519bff
|
changes
|
2020-04-22 08:31:09 -07:00 |
|
kevinz000
|
0eac988f52
|
okay!
|
2020-04-22 08:22:52 -07:00 |
|
Putnam
|
44925da1d8
|
Various dynamic tweaks
|
2020-04-21 20:52:33 -07:00 |
|
Ghom
|
1a9bcddc61
|
Merge pull request #11938 from Owai-Seek/crab-meat-4-19-2020
Ups Crab Meat from 1 to 4
|
2020-04-22 03:31:19 +02:00 |
|
Ghommie
|
e9bf432a0d
|
Scavenging element.
|
2020-04-22 03:30:40 +02:00 |
|
Ghommie
|
e6d777584f
|
Eh?
|
2020-04-21 20:49:49 +02:00 |
|
Ghommie
|
01f444b761
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-04-21 20:45:58 +02:00 |
|
Ghom
|
a2c796f943
|
Update legs_and_taurs.dm
|
2020-04-21 18:53:53 +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
|
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 |
|
Ghom
|
c7780bde9e
|
Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5
Shuffles resist embed higher up on the resist chain
|
2020-04-20 22:34:03 +02:00 |
|
kevinz000
|
a984fc5e3d
|
Update living.dm
|
2020-04-20 11:45:22 -07:00 |
|
kevinz000
|
096a182a84
|
Update living.dm
|
2020-04-20 11:44:59 -07:00 |
|
Ghommie
|
5a4fecdeb8
|
tested and it works now, I'm glad.
|
2020-04-20 19:22:42 +02:00 |
|
Ghommie
|
e703e12c88
|
WIP
|
2020-04-20 16:25:08 +02:00 |
|
Ghommie
|
0bef955806
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-04-20 15:14:30 +02:00 |
|