Commit Graph

1066 Commits

Author SHA1 Message Date
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
kevinz000 59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09: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
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
TrilbySpaceClone 9ae903187f always abuzz 2020-02-21 04:18:24 -05: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 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
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
Seris02 4ac7fff7e3 ye 2020-02-13 13:37:47 +08:00
kevinz000 70e752dbc9 this is totally not laggy 2020-02-11 23:45:22 -07:00
ShadeAware bbedf617f5 Declutters the Locker 2020-02-11 17:33:18 -05:00
Winter Flare 5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -05:00
kevinz000 c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
2020-02-10 04:16:14 -07:00
kevinz000 5d2b2d7fbf Merge pull request #10971 from Trilbyspaceclone/disco_baby
Adds more Alien disco
2020-02-10 04:14:18 -07:00
BlackMajor d778273083 Make ash walkers a static spawn 2020-02-10 21:46:03 +13:00
Ghom 0d37700836 Merge pull request #10926 from keronshb/PirateBombProof
Buffs the Pirate Ship to be bomb resistant
2020-02-10 08:40:10 +01:00
Ghommie c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Winter Flare bb641fecf8 Sprites, Tweaks, and Snacks
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
keronshb 60a3b134a3 Should fix the rest of the requested changes
Title
2020-02-09 17:30:22 -05:00
keronshb 9609eb64e0 Fixes some files and pathings for this
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
TrilbySpaceClone e5236eebb1 hey lets do corrections 2020-02-08 17:39:00 -05:00
TrilbySpaceClone 76219e0188 Primortial 2020-02-08 02:21:14 -05:00
Seris02 6d8bfd2a38 tru 2020-02-08 14:01:51 +08:00
Seris02 6af421994a yay 2020-02-08 13:53:43 +08:00
Seris02 4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000 75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4
Holofans visual tweak.
2020-02-06 00:42:39 -07:00
keronshb 5d1d652ea4 Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Seris02 d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02 6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Ghommie 5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
kevinz000 f3d955f397 Merge branch 'master' into staves 2020-02-04 14:54:35 -07:00