dd295d20c2
Merge branch 'master' into Plasmaispogtake2
2021-03-25 10:44:12 -04:00
7265724c5b
Update basemats.dm
2021-03-25 10:29:56 -04:00
899b94f0f3
Made threat a subsystem instead of dynamic-attached.
2021-03-24 23:44:37 -07:00
45340ef1ac
Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed.
2021-03-25 09:27:33 +11:00
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
ee4fad7966
Update basemats.dm
2021-03-23 20:34:17 -04:00
afd8af60e3
Merge pull request #14430 from YakumoChen/genetics
...
Adjusts Thermals in Genetics; Moves X-ray implant to illegal tech.
2021-03-23 22:35:54 +01:00
263c564170
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/suits.dmi
2021-03-23 13:25:13 -04:00
bfb122d706
Merge pull request #14475 from qweq12yt/black-market-fixes
...
Black Market: The return
2021-03-22 21:14:57 -06:00
f1e55f2df0
Paranoid updates to maybe fix air duplication
2021-03-20 22:02:47 -07:00
1fd06a89b7
Oh Boy
2021-03-20 16:27:52 -07:00
02b52e6142
framework
2021-03-20 16:02:26 -07:00
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
957c1fcc5d
okay
2021-03-20 14:09:23 -07:00
604a6efeca
baton change
2021-03-20 13:45:39 -07:00
292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
1f7b15d8f8
clonwops
2021-03-19 15:35:17 -03:00
8456b3f709
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/head.dmi
# icons/mob/clothing/mask.dmi
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/masks.dmi
# icons/obj/clothing/suits.dmi
2021-03-19 14:30:05 -04:00
2c2e779aa6
Merge remote-tracking branch 'origin/master' into fixes-2
2021-03-19 10:28:43 +08:00
e0cc6e3502
Merge pull request #14391 from kiwedespars/void-but-for-real
...
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
01d92230a3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/mask.dmi
2021-03-16 19:19:12 -04:00
b105a3c831
Merge pull request #14347 from timothyteakettle/language-tab
...
the speech panel pr
2021-03-16 20:31:58 +01:00
228105b391
laptop and closet decon fix
2021-03-16 14:47:28 +08:00
79a464ca8c
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
...
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
5d51025ad6
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-15 14:39:16 -07:00
91fc66e98d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into the-fuck-am-i-doing
2021-03-15 14:32:50 +01:00
7e50d878ca
Merge branch 'master' into the-fuck-am-i-doing
2021-03-15 14:09:30 +01:00
5ee6f23841
Safty isn't a word and even if it was this wouldn't be how you use it in a sentence.
2021-03-14 03:39:31 +13:00
69d927e756
Merge branch 'master' into void-but-for-real
2021-03-12 23:10:19 -08:00
0b64ea1ea4
thermal is a recipe now
2021-03-13 02:50:10 +00:00
456cea91f3
thermals locked
2021-03-13 02:47:20 +00:00
da303f7cf8
stimmed
2021-03-13 02:45:08 +00:00
e145bdafe8
adds domain expansion
...
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
2021-03-11 21:26:58 -08:00
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
939a493334
Merge pull request #14306 from Putnam3145/supernova
...
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
18fdd0c6cf
Merge pull request #14337 from kiwedespars/we-hate-cqc
...
nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
3b92e33112
Merge branch 'master' into void-but-for-real
2021-03-09 12:29:50 -08:00
3ce6459aef
void heretic and many other prs
2021-03-09 02:58:34 -08:00
d5b0251cb5
Merge branch 'master' into matContainer
2021-03-09 05:42:47 -05:00
de6f1401bb
final fix
2021-03-08 13:24:28 +08:00
0db08088c4
Fixes material insertion animations not working when there is no silo
2021-03-07 22:43:55 -05:00
395bdaf5f9
removes code i commented out
2021-03-07 04:13:18 -05:00
703567e591
other fixes
2021-03-07 04:09:36 -05:00
22b33d1a6e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-07 13:04:36 +08:00
c6ba7bfe1f
changes
2021-03-06 18:06:53 -07:00
f875218284
Fixes material component
2021-03-06 03:48:52 -05:00
03bd073cb5
fixes compile errors
2021-03-05 21:59:00 +01:00
8178b7073a
It's done, atleast the code is
2021-03-05 21:50:29 +01:00
2f1aba4f80
Revert "i can't believe kevin made me code"
...
This reverts commit 7f38564838
2021-03-05 21:19:59 +01:00
a061f02b5b
Revert "objectives"
...
This reverts commit dbabbb1062
2021-03-05 21:19:56 +01:00
CuteMoff