kevinz000
|
e39d7fa49d
|
Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
|
2020-02-28 04:30:12 -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
|
a99e9ec2ff
|
Ok
|
2020-02-27 02:15:03 +01:00 |
|
Ghommie
|
b5f472c6dd
|
thank you dreamchecker
|
2020-02-27 01:47:18 +01:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +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
|
803ac258f8
|
Merge pull request #11254 from deathride58/fuckclosets
Makes harm intent clicking closets attack them rather than place an item inside
|
2020-02-27 01:11:23 +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 |
|
kevinz000
|
626cf886d6
|
Update twohanded.dm
|
2020-02-26 05:31:47 -07:00 |
|
Trilbyspaceclone
|
7fe6ebb2c9
|
Update chair.dm
|
2020-02-26 00:24:09 -05:00 |
|
Ghom
|
5bd62d129f
|
Merge pull request #10877 from kevinz000/staves
Riot Electrostaves
|
2020-02-25 20:32:36 +01:00 |
|
Ghom
|
ea5774e713
|
Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
|
2020-02-25 14:41:40 +01:00 |
|
Ghom
|
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
|
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 |
|
Ghom
|
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 |
|
Ghom
|
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 |
|
kevinz000
|
8cf41997f5
|
Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
|
2020-02-24 02:33:54 -07:00 |
|
kevinz000
|
0cfa6699b1
|
yeah ok fine
|
2020-02-24 02:31:14 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
e76eff6966
|
Update plushes.dm
|
2020-02-24 02:21:51 -07:00 |
|
kevinz000
|
27b7cd560c
|
Update plushes.dm
|
2020-02-24 01:32:04 -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 |
|
Ghom
|
825beb41c1
|
Update paicard.dm
|
2020-02-23 22:44:38 +01:00 |
|
Ghom
|
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 |
|
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 |
|
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 |
|
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 |
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
Lin
|
9999e15db9
|
Merge pull request #11155 from necromanceranne/cham_project_exploities
Cham projector no longer lets you become literally unclickable
|
2020-02-20 16:50:07 -06:00 |
|
Ghom
|
7763475b83
|
Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
|
2020-02-20 15:33:27 +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
|
d680ab9fd5
|
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
|
2020-02-20 11:27:48 +01:00 |
|