5472186bc2
Merge pull request #14398 from LetterN/post-hardsync1.5
...
post-hardsync1.5
2021-03-14 23:30:26 -06:00
04f87e42f8
fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14399
2021-03-10 12:06:15 +08:00
d5b0251cb5
Merge branch 'master' into matContainer
2021-03-09 05:42:47 -05:00
703567e591
other fixes
2021-03-07 04:09:36 -05:00
2de08b7bae
lateinit mayhaps?
2021-03-06 20:01:14 +08:00
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
78ef87b012
minor fixes, compile but still bugged
2021-02-14 17:08:16 +08:00
de67720a0a
icons should exist
2021-02-14 11:39:56 +08:00
6286d40082
code works
2021-02-12 17:26:08 +08:00
b3ab2722f0
fug
2021-02-08 14:48:53 +01:00
6dabe348fa
fixes oversights
...
fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too
2021-02-08 14:43:33 +01:00
bd3761d39e
proper smooth movement
2021-01-08 10:51:48 -08:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
9990337f32
fixes a bunch of portal runtimes
...
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
2020-10-10 23:40:12 +02:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
051b81c574
Merge pull request #13485 from DeltaFire15/neovgre-oopsie
...
[s] Fixes a tiny Neovgre edge case
2020-10-03 14:20:24 -07:00
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
07f50845b6
no more conditional invincibility
2020-09-25 23:24:00 +02:00
5e355dafe8
Update mecha_defense.dm
2020-09-22 04:39:43 -07:00
60a299197b
Update mecha_defense.dm
2020-09-22 04:38:47 -07:00
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
a0adc984cd
ports #52214 from /tg/
2020-08-30 12:19:38 +10:00
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
9a9e3ffef5
fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category.
2020-08-03 21:14:17 +08:00
a19e306137
less redtext - updates anomalies
2020-08-03 20:53:36 +08:00
11a0154ec1
changes Neovgre's sounds again
2020-08-01 01:26:35 -04:00
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
22d5aebaa5
second batch - MAJOR: mech_fab, turrets
2020-07-24 14:38:04 +08:00
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
692656b02d
Whew
2020-07-20 11:53:33 -07:00
526d257410
fix
2020-07-20 11:48:08 -07:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
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
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
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
45a6061958
Merge pull request #12596 from Ghommie/Ghommie-cit819
...
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
765ffdb1a1
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
ab05e48149
adds the medical gygax
2020-06-20 16:22:28 -05:00
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
silicons