Commit Graph

28762 Commits

Author SHA1 Message Date
keronshb
e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
Lin
ab7bcd5f4d Merge pull request #15007 from LetterN/revert-14988-openthegates
Old Gateway animation return: now includes less icons
2021-08-21 13:06:22 -05:00
zeroisthebiggay
efc5598263 Update code/datums/components/crafting/glassware/lens_crafting.dm
Co-authored-by: MarinaGryphon <jadebishop.2562@gmail.com>
2021-08-20 21:55:54 -04:00
zeroisthebiggay
42964392e3 Update lens_crafting.dm 2021-08-19 23:39:05 -04:00
Lin
4ae7b63c22 Merge pull request #15019 from WanderingFox95/WanderingFox95-BlankBottles
[Ready] Blank Bottles
2021-08-19 13:22:31 -05:00
Lin
81a41a384c Merge pull request #15008 from WanderingFox95/WanderingFox95-MoreJaggedSharkTails
[Ready] Shark Tails, dodododododo
2021-08-19 12:32:37 -05:00
WanderingFox95
34422662b1 Nerfed the Capacities. 2021-08-18 21:00:56 +02:00
WanderingFox95
6c111d89c5 It's back in bottling research, also renamed. 2021-08-17 21:35:30 +02:00
WanderingFox95
4691397d03 Adds UNIQUE_RENAME to the bottles.
Thanks Teak!
2021-08-17 16:41:27 +02:00
WanderingFox95
c1f173d8e6 Decided against locking them behind research 2021-08-17 15:10:33 +02:00
WanderingFox95
631f8dfda5 Clarifies that there are now blank bottles in the research node too. 2021-08-17 14:52:09 +02:00
WanderingFox95
56246d9b56 Adds the bottles to the bottling research tech 2021-08-17 14:28:55 +02:00
WanderingFox95
dc5c107adc Bottles for the service lathe (Equipment) 2021-08-17 14:27:50 +02:00
WanderingFox95
c8889dee36 Bottles. 2021-08-17 14:21:55 +02:00
WanderingFox95
95b63a823b Bottles! 2021-08-17 14:21:11 +02:00
Timothy Teakettle
74595b2845 Update loadout.dm 2021-08-16 18:01:54 +01:00
WanderingFox95
888c6fed15 Since apparently nobody knows what shark tails look like... 2021-08-16 13:52:24 +02:00
silicons
f4658b49b1 Merge pull request #14991 from bunny232/master
Polyvitiligo now actually does something instead of making you a crayon eater.
2021-08-15 00:20:35 -07:00
silicons
2c18d34591 Merge pull request #15005 from BlueWildrose/ihavenomouthandimustslime
Blacklists incapacitated mobs from being sentience event candidates
2021-08-15 00:20:11 -07:00
Lin
048fa1cd18 Merge pull request #15004 from Citadel-Station-13/silicons-patch-3
Admin buildmode repair block now fixes baseturfs instead of simply placing plasteel flooring on empty space
2021-08-15 00:32:19 -05:00
WanderingFox95
4a78d8a880 Separates the tails. 2021-08-15 02:21:09 +02:00
Letter N
c8664d45bc this is why we cant have nice things 2021-08-14 10:52:53 +08:00
Letter N
c4d7d61764 Revert "Old Gateway animation return" 2021-08-14 10:48:19 +08:00
silicons
715a215cf1 Merge pull request #14992 from SandPoot/more-radial-wheels-for-your-pain
Changelings now use a radial menu to select DNAs (tg port)
2021-08-13 14:04:35 -07:00
BlueWildrose
d1a1c737d4 Blacklists incapacitated mobs from being sentience event candidates 2021-08-13 11:29:54 -07:00
silicons
b4bcfc3ffb Update repair.dm 2021-08-12 17:06:08 -07:00
Putnam3145
370f7ea9f8 this can be null, so 2021-08-11 21:04:18 -07:00
Putnam3145
86e053afd2 Fixes circular reference in genits 2021-08-11 21:03:02 -07:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
silicons
c37f2ca739 Merge pull request #14961 from Putnam3145/supermatter-auxgm
Makes supermatter properties auxgm-based
2021-08-11 02:01:05 -07:00
Lin
2ac89f4c12 Merge pull request #14989 from timothyteakettle/markings-for-all-i-guess
lets felinids, humans and moths have markings
2021-08-10 13:37:17 -05:00
Artur
c7a17b0e84 Didn't properly renamy my var 2021-08-10 20:15:07 +03:00
Artur
09227544be Name's too similar 2021-08-10 15:00:54 +03:00
Artur
0ff2e0cee5 makes the amount of integrated_blood lost equal to the blood_volume gained 2021-08-10 15:00:12 +03:00
SandPoot
c453d2230d perhaps this one as well? 2021-08-09 11:31:33 -03:00
SandPoot
6c338c6479 forget it, this one works good enough already 2021-08-09 11:03:51 -03:00
Lin
dbfa12bead Merge pull request #14981 from Putnam3145/revival-surgery
Makes rod of asclepius usable for revival surgery
2021-08-08 13:58:57 -05:00
Lin
64e13f31a8 Merge pull request #14988 from BlueWildrose/openthegates
Old Gateway animation return
2021-08-08 13:58:13 -05:00
SandPoot
2844c1df32 Update changeling.dm
Web change because angry i didn't notice.
2021-08-08 13:09:52 -03:00
SandPoot
1d0f1a56dd Upload files 2021-08-08 13:00:44 -03:00
bunny232
f3363c7b4e Update skin.dm 2021-08-08 09:05:47 -04:00
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
timothyteakettle
33e1ac1308 Update bugmen.dm 2021-08-07 22:30:43 +01:00
timothyteakettle
9b3a3d81d3 yes 2021-08-07 22:18:06 +01:00
Cognition
7b9a661127 Old Gateway animation return 2021-08-07 05:38:28 -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