Commit Graph
6522 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
kevinz000andGitHub 626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
TrilbyspacecloneandGitHub 7fe6ebb2c9 Update chair.dm 2020-02-26 00:24:09 -05:00
kevinz000 40c2bdf5ee oh boy 2020-02-25 14:06:12 -07:00
GhomandGitHub 5bd62d129f Merge pull request #10877 from kevinz000/staves
Riot Electrostaves
2020-02-25 20:32:36 +01:00
GhomandGitHub ea5774e713 Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
2020-02-25 14:41:40 +01:00
GhomandGitHub b8fa0c0977 Merge pull request #11217 from Citadel-Station-13/kevinz000-patch-12
plushies now use SAFEPICK
2020-02-25 14:31:07 +01:00
kevinz000 bfb8139225 DefaultCombatknockdown 2020-02-25 03:18:37 -07:00
kevinz000 00c70acee9 Target wew 2020-02-24 13:20:12 -07:00
kevinz000 26b908f53d thonk 2020-02-24 13:19:38 -07:00
kevinz000 90d7fd81b1 k 2020-02-24 13:17:08 -07:00
kevinz000 fa9e275237 k 2020-02-24 13:16:12 -07:00
kevinz000 59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07:00
GhomandGitHub f86e17d945 Merge pull request #11129 from Owai-Seek/movefood-2-16-20
Reorganize Food Recipes, "Balance" Tweaks
2020-02-24 20:53:36 +01:00
r4d6 f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
TrilbySpaceClone d138878e03 peace is an option
stops unneeded well violence
2020-02-24 12:18:49 -05:00
TrilbySpaceClone bc94cf25ee it didnt 2020-02-24 11:49:27 -05:00
TrilbySpaceClone a3917a1bbc huh that worked? 2020-02-24 11:47:06 -05:00
TrilbySpaceClone 525cedf16a this just works 2020-02-24 11:45:47 -05:00
GhomandGitHub 213a406568 Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11
hand teles uses a (slightly) less atrocious sprite for the beam
2020-02-24 16:40:17 +01:00
kevinz000andGitHub 8cf41997f5 Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
kevinz000andGitHub 0cfa6699b1 yeah ok fine 2020-02-24 02:31:14 -07:00
kevinz000andGitHub 43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
2020-02-24 02:30:36 -07:00
kevinz000andGitHub ae6c388510 Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3
Fixing pAI radios inability to be toggled on/off
2020-02-24 02:23:30 -07:00
kevinz000andGitHub 73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00
kevinz000andGitHub e76eff6966 Update plushes.dm 2020-02-24 02:21:51 -07:00
kevinz000 424eb48d9e fixes 2020-02-24 01:59:45 -07:00
kevinz000andGitHub 27b7cd560c Update plushes.dm 2020-02-24 01:32:04 -07:00
GhomandGitHub f5dbb0b20d Merge pull request #11187 from Trilbyspaceclone/sweet
New bar sign, The Hive
2020-02-23 22:47:37 +01:00
GhomandGitHub 3e232f93d9 Update barsigns.dm 2020-02-23 22:47:21 +01:00
GhomandGitHub 825beb41c1 Update paicard.dm 2020-02-23 22:44:38 +01:00
GhomandGitHub b3149d930f Fixing pAI radios inability to be toggled on/off 2020-02-23 21:31:53 +01:00
Hatterhat 31a93d9f32 you'd think i'd have remembered to change paths 2020-02-23 14:27:40 -06:00
TrilbySpaceClone c638a83e23 Merge branch 'master' into more_implants 2020-02-22 18:34:02 -05:00
TrilbyspacecloneandGitHub becdd3c4c1 Merge branch 'master' into more_crates+bags 2020-02-22 18:33:26 -05:00
TrilbyspacecloneandGitHub 3fd93a3bad Update shields.dm 2020-02-22 17:57:36 -05:00
TrilbyspacecloneandGitHub a4d1bb0995 Update kitchen.dm 2020-02-22 17:56:31 -05:00
TrilbySpaceClone 6a8c874779 Three new posters! 2020-02-22 17:38:25 -05:00
Hatterhat accc4ce776 grammar shit, silkstring buff, arrow costs, yikes 2020-02-22 15:33:07 -06:00
Hatterhat 75a5a6cd45 ellipses. dot dot dot. 2020-02-22 15:21:12 -06:00
Hatterhat 2d29b37ce9 slab spawns and grammar shidd 2020-02-22 15:14:09 -06:00
Seris02 68f15e16e7 fixed 2020-02-22 20:06:35 +08:00
Seris02 c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Seris02 84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Detective Google ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -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
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Winter Flare 79967b0ac5 Resolving some convos.
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
2020-02-21 07:16:39 -05:00
TrilbySpaceClone 9ae903187f always abuzz 2020-02-21 04:18:24 -05:00