deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghom
|
d78cdb9b37
|
Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
|
2020-03-04 23:46:10 +01:00 |
|
Ghom
|
7a2e0892d3
|
Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
|
2020-03-04 17:11:39 +01:00 |
|
Ghom
|
df5b4ab56d
|
Merge pull request #11321 from kevinz000/storage_components_are_bad
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
|
2020-03-04 14:31:09 +01:00 |
|
BlackMajor
|
43e77f7d3a
|
Last few fixes. Adds arcane wand to dead wizard roid.
|
2020-03-04 19:12:56 +13:00 |
|
kevinz000
|
5e2414bd90
|
fix
|
2020-03-03 22:25:35 -07:00 |
|
kevinz000
|
2d02ae0077
|
oops
|
2020-03-03 21:06:29 -07:00 |
|
kevinz000
|
cbf2355f19
|
Update code/datums/elements/sword_point.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-03 21:06:05 -07:00 |
|
kevinz000
|
6354b48659
|
fix
|
2020-03-03 20:58:06 -07:00 |
|
Ghom
|
81bb6978de
|
Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
|
2020-03-03 13:26:19 +01:00 |
|
Seris02
|
8c4c2842d0
|
fixes and code improvements
|
2020-03-03 19:27:09 +08:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Lin
|
fde24492b9
|
Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
|
2020-03-02 18:31:25 -06:00 |
|
Ghom
|
9375113426
|
Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
|
2020-03-02 16:36:22 +01:00 |
|
Ghommie
|
c0ff43f827
|
ofc, New arguments.
|
2020-03-01 16:34:43 +01:00 |
|
Ghommie
|
b0922dd70d
|
Actually..
|
2020-03-01 16:02:58 +01:00 |
|
Ghommie
|
893cca97a3
|
An old oversight with disease/var/viable_mobtypes.
|
2020-03-01 15:59:42 +01:00 |
|
Lin
|
70e2563579
|
Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
|
2020-02-29 00:13:58 -06:00 |
|
kevinz000
|
93d91b1808
|
Merge remote-tracking branch 'citadel/master' into sword_point
|
2020-02-28 13:39:56 -07:00 |
|
kevinz000
|
8ef68fa36b
|
En garde!
|
2020-02-28 13:35:41 -07:00 |
|
kevinz000
|
e39d7fa49d
|
Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
|
2020-02-28 04:30:12 -07: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 |
|
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 |
|
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 |
|
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 |
|