Commit Graph

21949 Commits

Author SHA1 Message Date
Detective Google
d85c24680d wendigos can't runtime when butchering if you can't butcher them 😎 2020-05-01 13:22:16 -05:00
Detective Google
7ef5246b19 fixes a bunch of mismatch atmos in ruins 2020-05-01 01:33:14 -05:00
Detective Google
2832b86e11 some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life 2020-05-01 01:17:56 -05:00
Detective Google
231fd0edea fixes the stupid fucking tile placing list 2020-04-30 23:04:35 -05:00
Detective Google
c911d81cdc fixes the volanic subtypes of the other thing 2020-04-30 21:21:59 -05:00
Detective Google
6316b02e68 unfucks changeturf for the more_caves 2020-04-30 21:17:41 -05:00
Detective Google
9c049ef02b more mapping fixes 2020-04-30 21:02:31 -05:00
kevinz000
c9cd134132 linter fix 2020-04-30 17:39:30 -07:00
Detective Google
df2b622007 nukes the SpawnTerrain proc used for tg geysers 2020-04-30 19:34:27 -05:00
Detective-Google
c146c898c0 Merge branch 'master' into 91-files-changed-fml 2020-04-30 18:42:38 -05:00
Detective Google
41d1dd1763 fixes the maps 2020-04-30 18:13:02 -05:00
Detective Google
f6736e862d it compiles, now to fix the maps 2020-04-30 15:49:06 -05: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
02265010d6 fixes 2020-04-30 10:07:17 -07:00
kevinz000
7e8ebfde83 whew 2020-04-30 10:03:35 -07:00
kevinz000
034499f356 new stuff 2020-04-30 09:59:08 -07:00
kevinz000
8dae739d8f fixes 2020-04-30 01:39:38 -07:00
kevinz000
615dc71069 fixes 2020-04-30 01:26:46 -07:00
kevinz000
bd7b1b1193 fixes 2020-04-30 01:23:21 -07:00
kevinz000
9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -07:00
kevinz000
f028672e3c Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml 2020-04-30 01:00:08 -07:00
kevinz000
432724a388 fixes 2020-04-30 00:58:59 -07:00
kevinz000
72cbb77ecc fixes 2020-04-30 00:48:37 -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