Commit Graph

525 Commits

Author SHA1 Message Date
SandPoot
1fa828a3f7 upload files 2020-12-30 13:57:10 -03:00
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
DeltaFire
06cb91ca3d updates all BODYPART_ORGANIC occurances
:)
2020-10-06 18:01:25 +02:00
Detective-Google
260ed6eff6 fixes arcade carpet 2020-10-05 21:27:42 -05:00
Detective Google
98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
silicons
c8d6f3d22a Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons
47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00
Letter N
d9ab31e199 commit 2 2020-10-01 11:30:01 +08:00
Detective Google
643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
silicons
1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
ItzGabby
b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
Dip
8d33b3a8da convert to machinery type 2020-09-16 20:28:31 -03:00
Dip
7e00d81758 Microfan Rework 2020-09-16 19:28:59 -03:00
Dip
394d383746 Clone Microfans 2020-09-15 19:27:58 -03:00
DeltaFire
f892309903 fixes 2020-09-15 17:35:58 +02:00
The0bserver
cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04:00
lolman360
55c8250324 AAAAAAAAAAAAAAAAA 2020-08-28 12:44:59 +10:00
lolman360
daeaf81ab6 e 2020-08-24 01:25:26 +10:00
lolman360
0f9f1e240c w 2020-08-24 00:51:13 +10:00
lolman360
4b2b4afc64 e 2020-08-24 00:49:31 +10:00
lolman360
6463d0b785 Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants 2020-08-24 00:27:29 +10:00
lolman360
b74c5ba22d ee 2020-08-24 00:27:22 +10:00
lolman360
460c92de74 3 2020-08-24 00:20:04 +10:00
lolman360
05250939c6 e 2020-08-23 23:58:04 +10:00
lolman360
bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
lolman360
4e23559065 Update sheet_types.dm 2020-08-18 18:15:24 +10:00
lolman360
8085ab01d9 culst! 2020-08-18 15:38:59 +10:00
lolman360
8f5078a15a Update mineral.dm 2020-08-18 14:47:47 +10:00
lolman360
bb86003510 w e w 2020-08-18 10:04:52 +10:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
lolman360
7ca4fa2f55 compilies/?? 2020-08-15 17:09:12 +10:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
lolman360
49948e77a4 SELLYOULOSE 2020-08-11 18:08:40 +10:00
chrisbbbbbbb
758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Hatterhat
a7d1a0ea48 gauze! stacksizes! shit. 2020-08-07 18:40:46 -05:00
silicons
2a0f2a38a7 Fix 2020-08-05 21:42:05 -07:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Lin
c310b1a70e Merge pull request #12997 from silicons/lavastaff
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
2020-08-05 19:43:38 -05:00
silicons
20dea7e41f fix 2020-08-01 20:45:49 -07:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Lin
447a0b24bf Merge pull request #12944 from timothyteakettle/fixes-crates
fixes some crafted crates containing items
2020-07-28 22:11:30 -05:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Timothy Teakettle
dc14c02570 fix crates 2020-07-27 21:55:51 +01:00