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
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
BlueWildrose
930e6f9876
Requested changes, ghost_role_spawner.dm
2020-02-17 19:47:48 -07:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000
eb33901046
Merge pull request #11002 from BlackMajor/walkerbois
...
Makes the Ash Walker camp a static spawn in lavaland.
2020-02-15 11:47:58 -07:00
TrilbySpaceClone
a1f1a01a81
grammer and quiver
2020-02-15 00:52:19 -05:00
TrilbySpaceClone
bbe1ddc0cf
silk, bows, and graytide!
2020-02-14 23:04:02 -05:00
Blue Wildrose
d45a20c19b
Podpeople tweaks
...
- Podpeople can wag tails now
- Moved a few features into the podperson race itself instead of its weaker, roundstart variant; this in theory, will allow pod-grown hydroponics podpeople to have hair now, as well as all those anthropomorphic features, should they be revived through this method.
- Fixed the lifebringers having no name somehow but... currently lifebringers under this change will turn them into animal anthropomorphic hairy mutants of some kind until I figure out how to make them the bald podpeople that they once were, could use some help with this.
2020-02-14 05:12:50 -07:00
kevinz000
e8ccf4b6d7
fix
2020-02-13 16:25:43 -07:00
Ghom
121b37410a
Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
...
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
Ghom
5730b717c5
Merge pull request #10969 from Seris02/crowbarcrate
...
allows you to wirecutters the manifests off crates without opening them
2020-02-13 09:41:10 +01:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Seris02
4ac7fff7e3
ye
2020-02-13 13:37:47 +08:00
