Commit Graph

28699 Commits

Author SHA1 Message Date
bunny232
50cf7a85f8 Merge pull request #2 from Citadel-Station-13/master
a
2021-08-08 08:51:58 -04:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Lin
139b08a734 Merge pull request #14984 from Putnam3145/supernova-more-than-one
Halves probability on supernova rads
2021-08-06 18:20:46 -05:00
Lin
6d093572cc Merge pull request #14975 from BlueWildrose/skirtbullshit
Fixes certain skirty uniforms not having the FEMALE_UNIFORM_TOP fitted flag
2021-08-05 22:42:21 -05:00
silicons
7b42b35f85 Merge pull request #14983 from Putnam3145/monstermos-fix-for-real
(Please testmerge first) Enables monstermos
2021-08-05 18:02:38 -07:00
Putnam3145
39679ea239 explicit "no rads" sentence 2021-08-05 06:19:29 -07:00
Putnam3145
571c017eec Also makes the end stuff only show if announced 2021-08-05 06:18:33 -07:00
Putnam3145
f821315263 Halves probability on supernova rads 2021-08-05 06:14:38 -07:00
bunny232
891824182b Merge pull request #1 from Citadel-Station-13/master
a
2021-08-04 19:41:56 -04:00
Putnam3145
7e34540903 Enables monstermos. 2021-08-04 00:54:52 -07:00
Putnam3145
77f62fa7df makes organs decay again 2021-08-03 21:19:28 -07:00
Putnam3145
d046357418 Merge pull request #14951 from timothyteakettle/leg-split
[TESTMERGE FIRST HOLY SHIT FUCK] fixes every single leg sprite in the entire game
2021-08-03 13:10:06 -07:00
Lin
d6b4b3b1f4 Merge pull request #14977 from BlueWildrose/hollowedhead
Fixes brainless sprite being an error sprite
2021-08-03 12:15:43 -05:00
silicons
2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit
[READY] tempgun rebalance (it's not a nerf don't worry)
2021-08-02 17:11:20 -07:00
BlueWildrose
cfc3a12a26 these don't have alternate sprites so therefore... 2021-08-01 07:24:36 -07:00
BlueWildrose
f747f76bd4 fix kimonos 2021-08-01 07:18:45 -07:00
BlueWildrose
fb886778b2 fix bathrobe 2021-08-01 07:17:29 -07:00
BlueWildrose
0735ec66b3 Fixes brainless sprite being an error sprite 2021-08-01 06:33:08 -07:00
Putnam3145
9ed9fbcc73 Merge pull request #14973 from TripleShades/pubbyyyy
[FAST MERGE] Pubby Deco Fix
2021-07-31 21:25:40 -07:00
BlueWildrose
1b31e4d626 let's fix some grammar while we're here. 2021-07-31 05:31:21 -07:00
BlueWildrose
698969933e fixing qipao women fitted states 2021-07-31 05:18:50 -07:00
BlueWildrose
ef413f5d2b fix miscellaneous female fittings 2021-07-31 05:15:46 -07:00
TripleShades
dfff5339c9 Update water.dm 2021-07-31 00:23:09 -04:00
TripleShades
652ffe22a2 Update water.dm 2021-07-30 23:58:11 -04:00
TripleShades
7d7525825d deco waterrrr 2021-07-30 23:51:57 -04:00
Artur
feac8568b6 shit fucking works now 2021-07-31 01:23:49 +03:00
Artur
977d129de6 Shuttle lights are back on 2021-07-30 23:45:55 +03:00
silicons
c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland
[Review/Testmerge] Icemoon Ruins but on Lavaland!
2021-07-29 22:39:42 -07:00
Artur
8d977e3042 Fucking init 2021-07-30 01:40:00 +03:00
Artur
2a670dcd43 This should fix it, why does our init update icons and not TG's? 2021-07-30 01:28:10 +03:00
Artur
dc40dfca81 goddamn stupid runtimes 2021-07-30 01:24:43 +03:00
Artur
ec4fc35593 Missed these.. 2021-07-29 20:33:16 +03:00
Artur
6023710c06 Actually we don't have looping sounds 2021-07-29 20:28:34 +03:00
Artur
d0a6e95793 gravitygenerator.dm now pretty much equal to tg's
Minus toggle_machine_stat and machine_stat mostly
2021-07-29 20:26:04 +03:00
Artur
4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam3145
639630b4fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into reenable-tests 2021-07-27 19:05:00 -07:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
Artur
9fcc762b7d pain 2021-07-28 02:13:57 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
187f0e4280 update_appearance 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Artur
d185c5a3e9 Re-adds the badmin nanite hub 2021-07-28 02:13:24 +03:00
Lin
560dc048cf Merge pull request #14954 from Putnam3145/poor-fastmos
Poor man's fastmos: just do diffusion faster 4head (+ auxmos update)
2021-07-26 15:09:43 -05:00
Lin
b1bdc8bf99 Merge pull request #14967 from Putnam3145/fix-space-loop-lord
Makes HE pipe min temp diff 0.01 instead of 20
2021-07-26 15:09:06 -05:00
Putnam3145
f8335f34f9 just removes the multi-surgery test for now. 2021-07-25 20:26:32 -07:00
Putnam3145
52d6828881 please. 2021-07-25 20:15:06 -07:00
Putnam3145
cbdcf4dfa5 we don't have tinker_nanites 2021-07-25 20:04:57 -07:00
Putnam3145
9a62fed735 /proc/ 2021-07-25 19:55:48 -07:00
Putnam3145
95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00