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
silicons
3d80792e79
more
2020-07-11 00:37:56 -07:00
silicons
8d5d194a26
hahahahaha
2020-07-11 00:30:56 -07:00
silicons and GitHub
4f4c6b85bf
Merge pull request #12720 from timothyteakettle/eye-contact
...
port examines and eye contact
2020-07-11 00:14:47 -07:00
Keate Senior
7422e86c1b
fucking forgot the defines
2020-07-09 16:41:23 -04:00
Artur
9de8483bcf
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-09 22:14:20 +03:00
Timothy Teakettle
02f46322ad
port examine
2020-07-09 18:32:45 +01:00
Putnam
9b955e5d03
gotta replace all of them actually
2020-07-09 03:19:52 -07:00
Putnam
7cf4a55496
at least it'll fail better this time
2020-07-09 02:18:08 -07:00
Putnam
196261296e
probably fixes travis
2020-07-09 01:40:39 -07:00
Putnam
aefdf9eef7
duplicate REVERSE_DIR
2020-07-09 01:38:17 -07:00
Putnam
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
Artur
e12d690d3f
hopefulyl fixes cloning!?!?
2020-07-08 23:54:00 +03:00
silicons
6cbab55ef8
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-07 21:07:58 -07:00
silicons
bd8cc4791f
whew
2020-07-07 21:02:23 -07:00
Lin and GitHub
33f56fd168
Merge pull request #12694 from Ghommie/Ghommie-cit833
...
mowing down experimental cloner copypasta.
2020-07-07 13:23:25 -05:00
Artur
280d3de6c3
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
Ghom and GitHub
e7d19f512e
Merge pull request #12397 from Rohesie/cooldown
...
Ports TGMC timer cooldowns
2020-07-06 22:54:58 +02:00
Ghommie
562b57095d
mowing down the experimental cloner copypasta.
2020-07-05 03:04:53 +02:00
Lin and GitHub
d04b335d1a
Merge pull request #12652 from silicons/cool
...
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
2020-07-04 14:12:43 -05:00
silicons
a738d52740
oh god oh FUCK
2020-07-03 00:11:09 -07:00
Ghommie
8afcea6026
ok
2020-07-03 08:55:21 +02:00
Ghommie
cdebccf38f
downgrading for now till I port cyberboss linux tgs4 docker hack and the end of BSQL.
...
Gosh please work, I'm dead tired.
2020-07-03 08:41:42 +02:00
silicons