Commit Graph

33577 Commits

Author SHA1 Message Date
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
eeda86d4a2 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml 2020-04-30 21:18:05 -05:00
Detective Google
6316b02e68 unfucks changeturf for the more_caves 2020-04-30 21:17:41 -05:00
kevinz000
8677e3b112 dmm2tgm 2020-04-30 19:14:44 -07:00
Detective Google
9c049ef02b more mapping fixes 2020-04-30 21:02:31 -05:00
Detective Google
e0fe368560 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml 2020-04-30 20:25:54 -05:00
Detective Google
d0024575e7 fixes the non matching turf atmos (hopefully) 2020-04-30 20:25:51 -05:00
kevinz000
270f5ed168 fix 2020-04-30 18:15:43 -07: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
8cd5b4ff4a fixes solars + removes the space tiles in the toxins burn chamber 2020-04-30 19:21:53 -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
kevinz000
2f236ffc04 Merge pull request #12048 from zeroisthebiggay/ilowkeydespiseatmospherics
deautismosifies box station atmospherics
2020-04-30 15:00:36 -07:00
Detective Google
f6736e862d it compiles, now to fix the maps 2020-04-30 15:49:06 -05:00
kevinz000
d2b7c35ec7 Merge pull request #12057 from MrJWhit/fixes-up-singulo-room
Links up the rad shutters in singulo engine
2020-04-30 11:13:51 -07: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
Ghom
373cafd60b Merge pull request #12063 from Citadel-Station-13/kevinz000-patch-6
Disables hardmode citadel combat
2020-04-30 18:20:17 +02: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
e6e2277634 Update damage_procs.dm 2020-04-30 01:07:40 -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
a90a246076 Merge pull request #12024 from NopemanMcHalt/digi-justice_trek
Fixes missing digitigrade sprite for ENT-era command uniform
2020-04-29 12:03:43 -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
619609f5ff Merge pull request #12020 from bunny232/master
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
2020-04-29 12:01:11 -07:00
kevinz000
18a8f9c607 Merge pull request #12043 from Owai-Seek/sprite-tweaks-4-27-20
Sprite Updates / Dupe Cleanup
2020-04-29 12:00:38 -07:00
kevinz000
57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358
Buffs shoulder holsters
2020-04-29 12:00:03 -07:00
kevinz000
1d12aa5779 Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors
Kilo station improvements
2020-04-29 11:59:26 -07:00
MrJWhit
7831b53932 Links up the rad shutters 2020-04-29 14:03:17 -04:00
Anonymous
c1f045c98a Merge remote-tracking branch 'upstream/master' into digi-justice_trek 2020-04-29 13:54:50 +03:00
deathride58
b63cccc38d Merge pull request #12053 from Putnam3145/fix_appendix
Fix appendices instakilling everyone
2020-04-29 01:27:06 -04: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