Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
timothyteakettle
060b3dcd04
im sorry moths
2020-07-24 03:27:44 +01:00
silicons
1f25c7f06d
Merge remote-tracking branch 'citadel/master' into shoelaces
2020-07-23 16:23:34 -07:00
Timothy Teakettle and GitHub
ed8723e74e
Merge branch 'master' into species-are-dumb
2020-07-23 22:15:10 +01:00
Timothy Teakettle
8f8aaee36c
fixes up drinks
2020-07-23 22:09:14 +01:00
Timothy Teakettle
450509347a
tidy species more
2020-07-23 21:57:32 +01:00
silicons
d30acd5b09
smooth
2020-07-23 13:49:17 -07:00
Lin and GitHub
e14f5ff576
Merge pull request #12832 from Citadel-Station-13/overlays-experimental
...
do we want (probably) free memory savings trick question yes we do
2020-07-23 13:41:36 -05:00
Lin and GitHub
fbfd6286b5
Merge pull request #12849 from Citadel-Station-13/silicons-patch-43
...
raises max keybind command length to 32 so controller users don't get kicked
2020-07-23 13:30:31 -05:00
silicons
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
silicons and GitHub
d520eaa0ad
Merge pull request #12854 from Zandario/tipes
...
tipes
2020-07-23 10:26:55 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
Keate Senior
fafde35ee2
Fixes the Arks looping issue, and gives Ratvar new words when fighting
...
Also removes the grace period variable since the ark activates immediately now /shrug
2020-07-23 12:59:40 -04:00
silicons
703afec454
ok
2020-07-23 08:57:15 -07:00
Letter N
827a1ad523
the define
2020-07-22 10:12:33 +08:00
lolman360
0f1aa3c0ca
'lolman? did you test your code?'
...
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
silicons
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
Zandario
bbf38c9898
tipes
2020-07-21 11:22:21 -05:00
silicons and GitHub
5347b9f6a5
Update keybindings.dm
2020-07-20 21:33:03 -07:00
Timothy Teakettle and GitHub
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons and GitHub
944a91e44d
Update subsystems.dm
2020-07-20 15:55:41 -07:00
silicons
924309aab8
changeS
2020-07-20 11:11:12 -07:00
silicons
984796b8c6
sigh
2020-07-20 10:46:52 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
Timothy Teakettle
b06948bed4
fry smite
2020-07-20 17:48:37 +01:00
Keate Senior
beb6dd6e08
scripture changes and new marauder variant
...
The Ark summoning scripture is being temporarily moved to applications until I can fix it not showing up in a new UI tab, as well as adds the Clockwork Guardian, a marauder variant that acts similar to holoparasites/guardian spirits in the sense that they're linked to a host. slower than normal marauders but with more health, they can automatically block and counter any melee attack, and heal their host up to a small amount if the host is heavily injured (65% health)
2020-07-20 03:16:03 -04:00
silicons and GitHub
6ac765eca5
Update subsystems.dm
2020-07-19 20:08:56 -07:00
silicons and GitHub
512174b782
Update subsystems.dm
2020-07-19 20:07:16 -07:00
timothyteakettle
8709a72fc0
fry everything
2020-07-20 00:40:18 +01:00
silicons
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
Timothy Teakettle and GitHub
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
Timothy Teakettle and GitHub
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
timothyteakettle
7714fcfaba
more changes
2020-07-18 01:26:38 +01:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
silicons and GitHub
484da28600
Merge branch 'master' into shoelaces
2020-07-16 17:31:41 -07:00
Arturlang and GitHub
92ed5d3201
Merge branch 'master' into TGUI-3.0
2020-07-16 15:59:37 +03:00
nik707 and GitHub
fa8a6dd3e1
Merge pull request #12788 from silicons/gasmixture_vv
...
"""user-friendly""" vv handling for new c++ atmos gas mixtures
2020-07-16 01:19:20 -05:00
timothyteakettle
03bd806c73
pickle
2020-07-16 02:51:07 +01:00
silicons
6fbd7914f5
stuff
2020-07-15 16:58:44 -07:00
Keate Senior
775c568a5b
the ark now screams more
...
halves the time between screams so that cultists know its in trouble. From 60 seconds to 30 seconds.
2020-07-15 00:46:35 -04:00
Artur
f5ee74803f
Updates minter to tg and the prereqs
2020-07-14 18:08:12 +03:00
Artur
d0f1a805e4
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-14 16:15:48 +03:00
Lin and GitHub
1b3112528c
Merge pull request #12746 from silicons/react
...
chemical reactions now have priority - "the first grenade helped with the revenant and the second blew up the evacuation shuttle"
2020-07-13 11:28:52 -05:00
Artur
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
silicons and GitHub
fbbb5f7ea8
Merge pull request #12678 from Ghommie/Ghommie-cit831
...
Updating rust-g dependencies to 0.4.4
2020-07-12 08:23:29 -07:00
silicons
72c5c2234e
ok
2020-07-12 05:15:55 -07:00
Keate Senior
80b4c03c82
Initial changes to get this to github for public reviewing
...
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
2020-07-12 00:43:54 -04:00
Lin and GitHub
955d9fa0cc
Merge pull request #12624 from Citadel-Station-13/policy
...
policy configuration & support hooks for clone memory disorder
2020-07-11 16:40:38 -05:00
Timothy Teakettle