9375113426
Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
...
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
70e2563579
Merge pull request #11266 from Ghommie/Ghommie-cit593
...
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
11f767d412
A couple mob holder oversights. Again?
2020-02-27 16:16:21 +01:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
954f03f4e0
Merge pull request #11150 from raspyosu/master
...
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
5bd62d129f
Merge pull request #10877 from kevinz000/staves
...
Riot Electrostaves
2020-02-25 20:32:36 +01:00
5ee2f0dcd8
Merge pull request #11169 from PersianXerxes/ohHeyKilo
...
Ports Kilo Station from Skyrat
2020-02-25 14:48:37 +01:00
ea5774e713
Merge pull request #11225 from r4d6/Random-Mining
...
Make the mining base's placement random
2020-02-25 14:41:40 +01:00
59e95555bb
Merge remote-tracking branch 'citadel/master' into staves
2020-02-24 13:09:45 -07:00
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
f76a1c15f3
Port random mining base
2020-02-24 13:27:54 -05:00
9355e9319b
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
...
you kids like extend votes?
2020-02-24 16:39:16 +01:00
8cf41997f5
Merge pull request #11201 from Hatterhat/bows
...
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
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
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
4c03d552ee
Gettin Salty. Fish is now Seafood.
2020-02-23 16:22:19 -05:00
094b92e58b
silk, time, rods
2020-02-23 13:12:25 -06:00
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
60b4c10215
Fish Category, Misc Moves
2020-02-22 19:02:43 -05:00
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06:00
ca29246878
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
2020-02-22 00:02:49 -06:00
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
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
28485ea108
Merge remote-tracking branch 'upstream/master'
2020-02-21 01:48:50 -05:00
4c10c830bf
Merge remote-tracking branch 'upstream/master' into psych+paramedic
2020-02-20 22:17:55 -06:00
a8f863f901
changes - sprites
2020-02-20 22:17:47 -06:00
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
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
7763475b83
Merge pull request #10572 from Tupinambis/SiliconDefault
...
Removes harm prevention clause indicators from relevant sources.
2020-02-20 15:33:27 +01:00
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
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
35aecac620
Disgust mood for bloodsuckers being disgusted, and blood bag inneficency
2020-02-20 12:50:25 +02:00
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
c4b4a90bd8
Oh hey it's KiloStation
...
Trying to make Kilo open...
Finally, the work begins!
Kilo added!
Kilo Station!
2020-02-20 00:58:54 -05:00
2dd5a0cfb8
Merge branch 'master' into hijack
2020-02-19 22:25:31 -07:00
6f31e1270e
Merge pull request #11098 from Trilbyspaceclone/bows!
...
Silk into clothing, bows, arrows, quivers and more!
2020-02-19 19:05:49 -07:00
a10c71320d
Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1
...
Makes the mob holder examine less dumb, also indentation.
2020-02-19 19:02:34 -07:00
796f51b557
Merge branch 'master' into TGUI_Next_Nanites
2020-02-20 00:52:55 +02:00
c920d198e2
Update Viro to /tg/ standards
2020-02-19 12:17:57 -05:00
eb342d1591
Update mood.dm
2020-02-19 17:14:30 +01:00
ee1f61b5de
F
2020-02-19 14:26:11 +01:00
057b6f591c
HEEY
2020-02-19 14:23:12 +01:00
00d66c9b91
Renamed CAT_FISH to CAT_EASTERN
2020-02-18 22:19:58 -05:00
d7949e810e
Merge remote-tracking branch 'citadel/master' into staves
2020-02-18 02:20:58 -07:00
6e32a466af
tweak mesmerize
...
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
2020-02-17 17:24:09 -05:00
b028b296f5
Update mob_holder.dm
2020-02-17 12:17:33 +01:00
c97111beda
Reorganise Food + Balance Tweaks
...
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
2020-02-17 05:32:03 -05:00
66d5e0e346
Update station.dm
2020-02-17 01:03:29 +01:00
Ghom