Ghommie
|
a1f252d558
|
Fixing several reported issues.
|
2020-05-01 19:48:27 +02:00 |
|
ZeroMan
|
52b7086876
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
|
2020-04-30 13:48:48 -04:00 |
|
Lin
|
7784f5efa1
|
Merge pull request #12034 from Citadel-Station-13/kevinz000-patch-7
Maybe fixes vehicles blocking projectiles
|
2020-04-30 17:41:07 +00:00 |
|
Lin
|
c4250a41d2
|
Merge pull request #12017 from kevinz000/skills
Implements a basic skill system + adds surgery skill
|
2020-04-30 17:39:21 +00:00 |
|
kevinz000
|
aedecc5f0b
|
Merge pull request #12031 from Trilbyspaceclone/cleanbot
Cleanbot
|
2020-04-30 10:37:37 -07:00 |
|
kevinz000
|
061265981d
|
Merge pull request #12052 from deathride58/fixescheetowalkers
fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade"
|
2020-04-30 10:37:23 -07:00 |
|
kevinz000
|
9d753fe74f
|
Update damage_procs.dm
|
2020-04-30 01:07:10 -07:00 |
|
kevinz000
|
1e42f3a3b7
|
Merge pull request #12023 from Ghommie/Ghommie-cit712
Fixing riding layers for human/cyborgs.
|
2020-04-29 12:03:29 -07:00 |
|
kevinz000
|
d176125c46
|
Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft
More Useful Gauze MK II
|
2020-04-29 12:02:51 -07:00 |
|
kevinz000
|
830e1b46c8
|
Merge pull request #12028 from Putnam3145/fix-story-storyteller
Some more admeme potential for dynamic
|
2020-04-29 12:02:21 -07:00 |
|
kevinz000
|
f9f573576e
|
Merge pull request #12038 from Trilbyspaceclone/patch-359
Corrects vending tackler gloves
|
2020-04-29 12:02:00 -07:00 |
|
kevinz000
|
3d116f5e7e
|
Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
|
2020-04-29 12:01:33 -07:00 |
|
kevinz000
|
57ab38185f
|
Merge pull request #12014 from Trilbyspaceclone/patch-358
Buffs shoulder holsters
|
2020-04-29 12:00:03 -07:00 |
|
Putnam
|
2c6ef2f5d1
|
fix appendices instakilling everyone
|
2020-04-28 22:14:32 -07:00 |
|
deathride58
|
95c7252d3f
|
fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade"
|
2020-04-29 00:01:26 -04:00 |
|
Lin
|
19f89ed1ba
|
Merge pull request #12022 from Ghommie/Ghommie-cit711
organ/on_life tweaks.
|
2020-04-29 01:15:02 +00:00 |
|
Lin
|
64a5831a28
|
Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2
Fixes cybernetics not updating slowdowns when dropping shield
|
2020-04-29 01:07:55 +00:00 |
|
ZeroMan
|
18eb42315e
|
i missed a src
|
2020-04-28 02:55:25 -04:00 |
|
ZeroMan
|
8dc130175d
|
i actually despise coding
|
2020-04-28 02:46:46 -04:00 |
|
Lin
|
50a6128a83
|
Merge pull request #12032 from Citadel-Station-13/kevinz000-patch-4
Silicons are now immune to default combat knockdown behavior
|
2020-04-27 16:24:49 +00:00 |
|
Lin
|
68bad2ee3f
|
Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6
fixes shield bashing working while downed
|
2020-04-27 16:24:29 +00:00 |
|
TrilbySpaceClone
|
1191268430
|
kevs request
|
2020-04-27 07:34:23 -04:00 |
|
TrilbySpaceClone
|
5d6da47db7
|
Merge branch 'master' into medical-witchcraft
|
2020-04-27 07:25:18 -04:00 |
|
kevinz000
|
4e8a8dbebd
|
Update items.dm
|
2020-04-27 02:55:11 -07:00 |
|
Trilbyspaceclone
|
e33087cbf2
|
corrects vending tackler gloves
|
2020-04-26 22:06:35 -04:00 |
|
Putnam
|
51c6387224
|
now
|
2020-04-26 13:44:04 -07:00 |
|
Ghom
|
858c697acc
|
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
|
2020-04-26 14:03:15 +02:00 |
|
Ghom
|
b1befc2ba4
|
Merge pull request #11989 from Citadel-Station-13/kevinz000-patch-2
Nerfs confusion
|
2020-04-26 13:50:46 +02:00 |
|
Ghom
|
0cb32c901e
|
Merge pull request #12013 from kappa-sama/patch-23
lowers plasmafist to standard spell costs
|
2020-04-26 13:45:28 +02:00 |
|
Putnam
|
00c2ddce8f
|
Actually this is better
|
2020-04-25 23:18:37 -07:00 |
|
Putnam
|
3da4701dff
|
Switch roundstart thing to initial.
|
2020-04-25 23:06:15 -07:00 |
|
kevinz000
|
464fcd02cd
|
Merge remote-tracking branch 'citadel/master' into skills
|
2020-04-25 22:18:08 -07:00 |
|
kevinz000
|
0e8c2ca109
|
Update projectile.dm
|
2020-04-25 21:04:22 -07:00 |
|
kevinz000
|
5c20bde9f0
|
Update shields.dm
|
2020-04-25 20:58:22 -07:00 |
|
kevinz000
|
e54ba579d0
|
Update silicon_defense.dm
|
2020-04-25 20:52:27 -07:00 |
|
TrilbySpaceClone
|
1740531432
|
it just complies
|
2020-04-25 23:23:42 -04:00 |
|
Putnam
|
257de9d4c9
|
Adds uplinks back to nukies.
|
2020-04-25 19:22:55 -07:00 |
|
kevinz000
|
8fc661ba14
|
Update pins.dm
|
2020-04-25 17:34:00 -07:00 |
|
Putnam
|
d7c0834794
|
A couple important comments.
|
2020-04-25 17:22:12 -07:00 |
|
kevinz000
|
5e750bd43d
|
Update pins.dm
|
2020-04-25 17:21:33 -07:00 |
|
Putnam
|
77a378b131
|
wow that's the wrong thing to do
|
2020-04-25 17:16:31 -07:00 |
|
Putnam
|
b9e88f85bb
|
Allowed better admeme stuff for dynamic
|
2020-04-25 17:15:17 -07:00 |
|
kevinz000
|
565bfdb7b0
|
Merge pull request #11959 from Trilbyspaceclone/patch-351
Nerfs spiders defence stat against flyswatters - Alt Australian crew buff.
|
2020-04-25 17:10:33 -07:00 |
|
kevinz000
|
af08e0fecf
|
Merge pull request #11984 from Hatterhat/fastpump
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
|
2020-04-25 17:07:29 -07:00 |
|
kevinz000
|
24bac60a95
|
Merge pull request #12012 from Ghommie/Ghommie-cit710
Fixing non-skirt dresses being invisible on digitigrades.
|
2020-04-25 17:05:49 -07:00 |
|
kevinz000
|
d7f38faab9
|
Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
|
2020-04-25 17:05:38 -07:00 |
|
kevinz000
|
f6a5f92ff3
|
Merge pull request #11918 from Ghommie/Ghommie-cit689
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
|
2020-04-25 16:59:38 -07:00 |
|
kevinz000
|
d9b6ea5181
|
Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
|
2020-04-25 16:59:07 -07:00 |
|
kevinz000
|
0dc259a985
|
Merge pull request #11990 from Trilbyspaceclone/patch-357
Test merge maybe - Buffs space vines
|
2020-04-25 16:54:47 -07:00 |
|
kevinz000
|
36512938a0
|
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
Adds nanite replication protocols to our techweb
|
2020-04-25 16:54:32 -07:00 |
|