Commit Graph

44246 Commits

Author SHA1 Message Date
CitadelStationBot
75973bcb3d Automatic changelog generation for PR #15033 [ci skip] 2021-08-25 17:51:59 -05:00
Lin
3b13a3b898 Merge pull request #15033 from keronshb/CatwalkFlooringPort
Ports Catwalk flooring and gives it a recipe
2021-08-25 17:51:57 -05:00
Changelogs
4eb61e4899 Automatic changelog compile [ci skip] 2021-08-25 00:24:59 +00:00
Changelogs
11120d3722 Automatic changelog compile [ci skip] 2021-08-24 00:23:59 +00:00
CitadelStationBot
eea2b8a514 Automatic changelog generation for PR #15023 [ci skip] 2021-08-23 15:28:25 -05:00
Lin
76f4859480 Merge pull request #15023 from BlueWildrose/MKblastin
Brings back the MK ultra gas, remove MK ultra explosion, but makes the gas less horny and prefbreaky
2021-08-23 15:28:22 -05:00
keronshb
e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
keronshb
c4b3aef1d2 Merge remote-tracking branch 'upstream/master' 2021-08-22 21:05:42 -04:00
Changelogs
ad058f2c4a Automatic changelog compile [ci skip] 2021-08-23 00:23:00 +00:00
BlueWildrose
af94680c7d this probably sounds better 2021-08-22 14:45:18 -07:00
CitadelStationBot
bed4b4e5a0 Automatic changelog generation for PR #15031 [ci skip] 2021-08-22 13:20:02 -05:00
Lin
3f8895e41d Merge pull request #15031 from zeroisthebiggay/patch-16
undoes more Trillby™ Spelling™
2021-08-22 13:19:59 -05:00
Changelogs
97cb1613bb Automatic changelog compile [ci skip] 2021-08-22 00:24:06 +00: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
CitadelStationBot
1ecc88ec5b Automatic changelog generation for PR #15026 [ci skip] 2021-08-21 13:04:54 -05:00
Lin
149295962f Merge pull request #15026 from zeroisthebiggay/patch-15
undoes a small amount of Trillby™ Spelling™
2021-08-21 13:04:52 -05:00
zeroisthebiggay
7b7541b77e Update glassware.dm 2021-08-21 05:51:02 -04: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
Changelogs
485cf67f89 Automatic changelog compile [ci skip] 2021-08-21 00:23:09 +00:00
zeroisthebiggay
42964392e3 Update lens_crafting.dm 2021-08-19 23:39:05 -04:00
Changelogs
8e442b5472 Automatic changelog compile [ci skip] 2021-08-20 00:24:00 +00:00
CitadelStationBot
549ba01596 Automatic changelog generation for PR #15022 [ci skip] 2021-08-19 13:49:48 -05:00
Lin
51e884b0ba Merge pull request #15022 from Putnam3145/beach-tweaks
Adds some showers to the beach
2021-08-19 13:49:45 -05:00
CitadelStationBot
9405507f21 Automatic changelog generation for PR #15006 [ci skip] 2021-08-19 13:46:27 -05:00
Lin
7ded23f9ba Merge pull request #15006 from TripleShades/pubby
Pubby Additions + Touchups
2021-08-19 13:46:24 -05:00
CitadelStationBot
92715e5e96 Automatic changelog generation for PR #15019 [ci skip] 2021-08-19 13:22:33 -05:00
Lin
4ae7b63c22 Merge pull request #15019 from WanderingFox95/WanderingFox95-BlankBottles
[Ready] Blank Bottles
2021-08-19 13:22:31 -05:00
CitadelStationBot
ae028caf3f Automatic changelog generation for PR #15009 [ci skip] 2021-08-19 12:33:11 -05:00
Lin
e0f919e0d7 Merge pull request #15009 from EmeraldSundisk/omega83
Ship happens on OmegaStation.
2021-08-19 12:33:08 -05:00
CitadelStationBot
c295328dd7 Automatic changelog generation for PR #15008 [ci skip] 2021-08-19 12:32:40 -05:00
Lin
81a41a384c Merge pull request #15008 from WanderingFox95/WanderingFox95-MoreJaggedSharkTails
[Ready] Shark Tails, dodododododo
2021-08-19 12:32:37 -05:00
BlueWildrose
d117a9b662 woops, that actually was needed. 2021-08-19 04:41:18 -07:00
BlueWildrose
48b2877fab unhornys the MK ultra gas 2021-08-19 04:25:54 -07:00
BlueWildrose
f5688b1ed0 bring back old smoke effect 2021-08-19 01:47:00 -07:00
Changelogs
05a9b837d6 Automatic changelog compile [ci skip] 2021-08-19 00:21:13 +00:00
WanderingFox95
34422662b1 Nerfed the Capacities. 2021-08-18 21:00:56 +02:00
Putnam3145
cc0fb99029 Adds some showers to the beach 2021-08-18 10:19:29 -07:00
Changelogs
aa422f3180 Automatic changelog compile [ci skip] 2021-08-18 00:24:00 +00:00
WanderingFox95
6c111d89c5 It's back in bottling research, also renamed. 2021-08-17 21:35:30 +02:00
CitadelStationBot
989ba16e0e Automatic changelog generation for PR #15017 [ci skip] 2021-08-17 14:02:21 -05:00
silicons
4b42e2145d Merge pull request #15017 from timothyteakettle/ok
lets you select 4 prosthetic limbs instead of only 2
2021-08-17 12:02:19 -07: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
keronshb
d6d56ecd04 Merge remote-tracking branch 'upstream/master' 2021-08-17 09:03:32 -04: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
WanderingFox95
022e799948 Sprites 2021-08-17 14:20:04 +02:00