deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghom
|
6dd27506e1
|
Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22
what the fuck you mean music line too long??
|
2020-03-04 17:11:12 +01:00 |
|
KathrinBailey
|
11750b4fa9
|
removed redundant icon line
|
2020-03-04 14:16:27 +00:00 |
|
kevinz000
|
b6431b0ef6
|
changes
|
2020-03-03 20:54:53 -07:00 |
|
kevinz000
|
8b0b685fa7
|
CHECK_MOBILITY
|
2020-03-03 20:40:33 -07:00 |
|
KathrinBailey
|
97733e464d
|
ghommie change and armrest bug fix
|
2020-03-04 01:35:00 +00:00 |
|
KathrinBailey
|
86790c69a5
|
credits accidently left out previously
re-adds nod to CEV Eris for their original sprites.
|
2020-03-03 14:38:16 +00:00 |
|
KathrinBailey
|
83ec1e428c
|
Merge remote-tracking branch 'upstream/master' into Kat-Furniture
|
2020-03-03 13:48:18 +00:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
kevinz000
|
c21bd60929
|
fix
|
2020-03-03 03:04:23 -07:00 |
|
kevinz000
|
e1f3985309
|
Update musician.dm
|
2020-03-02 05:33:48 -07:00 |
|
KathrinBailey
|
d817442f02
|
It works!
Everything works now.
|
2020-03-01 13:42:14 +00:00 |
|
KathrinBailey
|
72d3572ec3
|
New sofas added, need to be added to sheet_types.dm still
Backing up the .dmi changes and two comfy chairs.
|
2020-03-01 11:58:59 +00:00 |
|
ancientpower
|
5c5ec541ae
|
Merge branch 'master' into paramedic-tweaks
|
2020-02-29 01:55:46 -06:00 |
|
Lin
|
5ee4a355c1
|
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
Fixing refrigerators locking when closed
|
2020-02-29 00:21:43 -06:00 |
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
kevinz000
|
045d5b2dbf
|
fixes
|
2020-02-27 20:06:52 -07:00 |
|
Ghom
|
ebe16768d4
|
Merge pull request #11249 from Trilbyspaceclone/patch-298
Corrects bar stool name
|
2020-02-27 12:40:41 +01:00 |
|
Ghom
|
6e25a34aaa
|
Merge pull request #11257 from Linzolle/pacifist-spike
pacifists can no longer meatspike
|
2020-02-27 01:18:57 +01:00 |
|
Ghom
|
2c642d5507
|
Update kitchen_spike.dm
|
2020-02-27 01:10:38 +01:00 |
|
Lin
|
69e3d857a8
|
derp
|
2020-02-26 21:39:53 +00:00 |
|
Lin
|
ac384e4d70
|
consistency?
|
2020-02-26 21:01:34 +00:00 |
|
Lin
|
c708d30d47
|
shitty webedit
|
2020-02-26 20:59:32 +00:00 |
|
deathride58
|
c232356a88
|
Makes clicking open closets with items on harm intent attack the closet rather than put the item in the closet
|
2020-02-26 09:51:48 -05:00 |
|
Trilbyspaceclone
|
7fe6ebb2c9
|
Update chair.dm
|
2020-02-26 00:24:09 -05:00 |
|
kevinz000
|
bfb8139225
|
DefaultCombatknockdown
|
2020-02-25 03:18:37 -07:00 |
|
kevinz000
|
59e95555bb
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-24 13:09:45 -07:00 |
|
kevinz000
|
424eb48d9e
|
fixes
|
2020-02-24 01:59:45 -07:00 |
|
Ghom
|
f5dbb0b20d
|
Merge pull request #11187 from Trilbyspaceclone/sweet
New bar sign, The Hive
|
2020-02-23 22:47:37 +01:00 |
|
Ghom
|
3e232f93d9
|
Update barsigns.dm
|
2020-02-23 22:47:21 +01:00 |
|
Hatterhat
|
31a93d9f32
|
you'd think i'd have remembered to change paths
|
2020-02-23 14:27:40 -06:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
TrilbySpaceClone
|
9ae903187f
|
always abuzz
|
2020-02-21 04:18:24 -05:00 |
|
Ghom
|
503214dee6
|
Update freezer.dm
|
2020-02-21 02:26:52 +01:00 |
|
Ghom
|
26bbc64f16
|
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
Ports Broom, Tweak Janitor Vendor
|
2020-02-20 11:48:06 +01:00 |
|
Ghom
|
89f256866d
|
Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
|
2020-02-20 11:24:50 +01:00 |
|
Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
kevinz000
|
b66b8ac2a0
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-19 14:32:28 -07:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Ghom
|
0619521418
|
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
Corrects a few cargo crates/exports (and nerfs some)
|
2020-02-19 02:10:25 +01:00 |
|
Ghom
|
08c86ec1ea
|
Merge pull request #11091 from BlueWildrose/master
Podpeople species tail wag fix; also lifebringer name fix
|
2020-02-18 17:11:50 +01:00 |
|
kevinz000
|
8666a36b1e
|
fixes most things
|
2020-02-18 02:24:31 -07:00 |
|
kevinz000
|
d7949e810e
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-18 02:20:58 -07:00 |
|
Winter Flare
|
1a994e7f1e
|
Ports Broom, Tweak Janitor Vendor
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120
Makes Broom printable.
Reduces Broom sound effect.
Updates Janitor Vendor to have equipment for at least 2 janitors.
|
2020-02-17 23:36:22 -05:00 |
|
BlueWildrose
|
cfca197fbb
|
forgot one last change that I made out of frustration because making things bald wasn't working for some reason
|
2020-02-17 19:55:32 -07:00 |
|