kevinz000
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
Seris02
b195783dfb
yeet 6
2020-02-28 14:31:47 +08:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
BlackMajor
fc4f9e7800
How about a few more roids.
2020-02-28 16:07:57 +13:00
Ghommie
11f767d412
A couple mob holder oversights. Again?
2020-02-27 16:16:21 +01:00
Seris02
8140962275
yeet 4
2020-02-27 21:05:27 +08:00
Seris02
d3385fb8c8
yeet 3
2020-02-27 21:03:50 +08:00
Seris02
a14fe06241
probably fixes it
2020-02-27 20:51:19 +08:00
Seris02
6e6b8fbd8a
yeet 2
2020-02-27 20:35:53 +08:00
Ghommie
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
Ghom
954f03f4e0
Merge pull request #11150 from raspyosu/master
...
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
Seris02
de6e8012f3
balances yee
2020-02-26 17:49:37 +08:00
BlackMajor
be740ba690
Merge branch 'master' into SpaceRuins
2020-02-26 20:58:46 +13:00
Putnam
ebac066b2f
lets add traitor classes
2020-02-25 16:10:23 -08:00
Ghom
5bd62d129f
Merge pull request #10877 from kevinz000/staves
...
Riot Electrostaves
2020-02-25 20:32:36 +01:00
Ghom
5ee2f0dcd8
Merge pull request #11169 from PersianXerxes/ohHeyKilo
...
Ports Kilo Station from Skyrat
2020-02-25 14:48:37 +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
BlackMajor
fc85f62546
Merge branch 'master' into SpaceRuins
2020-02-25 16:51:39 +13: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
9355e9319b
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
...
you kids like extend votes?
2020-02-24 16:39:16 +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
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
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
BlackMajor
ca6341aac4
Merge branch 'master' into SpaceRuins
2020-02-24 19:47:52 +13:00
Winter Flare
4c03d552ee
Gettin Salty. Fish is now Seafood.
2020-02-23 16:22:19 -05:00
Hatterhat
094b92e58b
silk, time, rods
2020-02-23 13:12:25 -06:00
Persi
4af2eee9dd
Haha, okay... this will break Kilo
...
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
2020-02-23 02:28:18 -05:00
Winter Flare
60b4c10215
Fish Category, Misc Moves
2020-02-22 19:02:43 -05:00
Hatterhat
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
Hatterhat
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06:00
Seris02
9028169caf
fixed?
2020-02-22 20:16:40 +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
88ae429720
runtime fix
2020-02-22 19:45:57 +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
d112556ea3
Fix, New Category, file renames.
...
Remove Sweets Category
Add Donut Category
Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI)
Rename recipies_pie.dm to recipies_pie_sweets.dm
Remove Onigiri from Misc (It's in Eastern)
2020-02-21 09:34:13 -05:00
raspyosu
28485ea108
Merge remote-tracking branch 'upstream/master'
2020-02-21 01:48:50 -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
Ghom
8395ee53e7
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
...
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
2020-02-21 02:47:18 +01:00
Ghom
e92183e968
Merge pull request #10541 from Detective-Google/the-p-o-o-l
...
adds the POOL to box station
2020-02-21 02:43:04 +01: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
608bb0a04c
Merge pull request #10649 from kevinz000/hijack
...
Completely reworks the hijack objective, and shuttle hijacking in general
2020-02-20 14:40:08 +01:00
kevinz000
ca777c6c8b
Merge pull request #11153 from Ghommie/Ghommie-cit587
...
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
Artur
35aecac620
Disgust mood for bloodsuckers being disgusted, and blood bag inneficency
2020-02-20 12:50:25 +02:00
