77f4e08727
AAAAAAAAA
2021-02-13 18:57:30 -07:00
ff9e2281e0
trynna nerf cloak more
...
trynna nerf cloak more
2021-02-13 16:33:44 -05:00
d43c7c00f6
conflicts and stealth nerf
2021-02-13 13:51:03 -05:00
3e08ab2bcc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/obj/items_and_weapons.dmi
2021-02-13 13:45:59 -05:00
45d6a5f87f
it compiles, UNTESTED YET
2021-02-13 21:41:59 +08:00
acf06abed5
Update eldritch_items.dm
2021-02-12 22:50:09 -07:00
731c368ba7
Merge pull request #14231 from DeltaFire15/sigh
...
sigh
2021-02-12 19:00:14 -07:00
ae55071fe8
Merge pull request #14232 from DeltaFire15/better-be-named
...
Fixes & Improves some antagpanel stuff
2021-02-12 19:00:07 -07:00
76837ee0b6
Merge pull request #14225 from Hatterhat/dth-kit-pass2
...
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
2021-02-12 18:54:36 -07:00
b465225bc2
Update eldritch_items.dm
2021-02-12 18:53:38 -07:00
5d001fc4b3
rice hat fix
2021-02-12 16:13:59 -06:00
c40427da05
i hate changelings
...
i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings
2021-02-12 19:23:59 +01:00
eacf1ef40b
dynamic still has permakill obj but i aint touching dynamic code
2021-02-12 19:20:22 +01:00
806d96076e
i dont actually know how to code btw
2021-02-12 18:41:58 +01:00
70303319f4
hrnngh CTRL+S doesnt save everything
2021-02-12 18:26:52 +01:00
503c276f9f
uh second try
2021-02-12 18:25:03 +01:00
51b4172509
T-G-U-I
2021-02-12 18:36:12 +08:00
5b0a1077f4
Modular Cmp Updates
2021-02-12 18:29:00 +08:00
5db87b9065
more updates!
2021-02-12 17:52:59 +08:00
6286d40082
code works
2021-02-12 17:26:08 +08:00
7f0af72e8f
splits the announcement message in half so that the subtitles line up
2021-02-12 03:53:31 -05:00
3d7e74ba66
less loot more danger
...
touches stuff up, removes gamer loot, buffs a frog and adds apes.
2021-02-11 23:44:54 -06:00
a2419f760a
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-12 13:18:09 +08:00
92eb4fb684
filter
2021-02-12 12:40:24 +08:00
1ea3aafa10
Merge pull request #14166 from Hatterhat/ebola-nerf
...
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
2021-02-12 05:06:48 +01:00
3167dd8e22
atmos cc, cpl
2021-02-12 11:50:39 +08:00
8a0c932d55
oops! All Refactors!
2021-02-12 11:07:58 +08:00
06101ee9c8
sigh
2021-02-12 03:30:15 +01:00
b0ff405a13
cool
2021-02-12 03:06:53 +01:00
fb4641b348
e
2021-02-12 02:42:59 +01:00
61877a3d1c
Merge pull request #14223 from timothyteakettle/quieten-a-log
...
changes a migration error to use log_game instead of message_admins
2021-02-11 19:02:44 -06:00
5afa573fa6
sigh
...
sigh
2021-02-12 00:50:42 +01:00
b786dff6ef
comma
2021-02-11 13:25:43 -03:00
a0c92f0646
upload files
2021-02-11 13:22:37 -03:00
919e23c122
More Clothes
2021-02-11 02:36:50 -05:00
3040eca4e0
holy shit what was i thinking god FUCK durathread
2021-02-11 00:20:49 -06:00
7259f53160
Merge pull request #14206 from Citadel-Station-13/silicons-patch-10
...
Nerfs VoG stun, knockdown, vomit. Removes sleep command.
2021-02-11 04:32:37 +01:00
7fbb41eee0
screaming
2021-02-11 04:12:42 +01:00
aa2e11a417
medica medica medica medica
...
medica medica medica medica
2021-02-10 20:53:29 -05:00
c3f0d0b9c8
fixes some bullshit assery
...
fixes some bullshit assery
2021-02-10 20:40:39 -05:00
a2a8ab12c6
Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum
2021-02-10 20:01:09 -05:00
41530110a2
LINTER
...
AHHHH NEW LINE
2021-02-10 20:00:17 -05:00
ec8029b0cc
a couple more fixes
2021-02-10 20:00:04 -05:00
969ac7e5e4
now no longer wrong
...
now no longer wrong
2021-02-10 19:01:08 -05:00
00d7b0c9c9
Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum
2021-02-10 18:57:05 -05:00
de2e410c6f
a bit more stuff
2021-02-10 18:55:56 -05:00
d858c420aa
Update preferences_savefile.dm
2021-02-10 23:18:53 +00:00
73020eba35
information here is wrong
...
information here is wrong
2021-02-10 14:27:14 -05:00
87eb447c10
some final touch ups
2021-02-10 14:22:04 -05:00
e530e8d103
god i hate this
...
god i hate this
2021-02-10 13:05:21 -05:00
silicons