Commit Graph

8585 Commits

Author SHA1 Message Date
silicons
04a0c2be6c Merge pull request #13194 from DeltaFire15/slab-wiki
Updates the clockcult help link to link to our wiki.
2020-08-18 18:53:21 -07:00
Detective Google
b13048f636 makes glass floors actually deconstructable 2020-08-17 12:15:09 -05:00
DeltaFire
31f1e04654 updates the helpertext in general
Recollection doesn't actually offer any help anymore and just redirects you to the wiki anyways.
2020-08-17 17:03:53 +02:00
DeltaFire
c74803dd1a updates the wiki page link 2020-08-17 16:53:49 +02:00
silicons
f611945b34 Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
2020-08-17 03:14:15 -07:00
Putnam3145
23b4ba3714 Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
2020-08-17 03:13:14 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
silicons
83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00
silicons
a900c07846 Merge branch '13163' 2020-08-16 18:51:24 -07:00
silicons
44e2327280 Merge branch '13143' 2020-08-16 18:47:48 -07:00
silicons
397cdb6c03 Merge branch '13129' 2020-08-16 18:45:35 -07:00
silicons
9c63a09907 Merge branch 'pr-13087' 2020-08-16 18:40:07 -07:00
silicons
01dd2f389b Merge branch 'pr-13067' 2020-08-16 18:38:13 -07: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
Detective Google
44e024a62f specification 2020-08-16 18:44:05 -05:00
Detective Google
0e1586f24d adds a construction path to glass floors 2020-08-16 18:21:29 -05:00
Hatterhat
bc0ca30647 there is no cooldown, press G 2020-08-16 15:45:11 -05:00
Detective-Google
ff6ef5d476 local idiot learns to spell 2020-08-16 00:22:21 -05:00
Detective Google
016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
Navier
fc70d3dde2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG 2020-08-15 23:13:41 -04:00
silicons
b2c65e34fc Merge pull request #13157 from kiwedespars/nullrod-nerf
chaplain nullrod nerf
2020-08-15 08:00:43 -07:00
Detective-Google
f41c412cb9 material -> mineral 2020-08-14 23:41:29 -05:00
Letter N
15a1ffde52 fix 2020-08-15 09:46:50 +08:00
Detective-Google
76bfd9b3a6 ? 2020-08-14 16:09:49 -05:00
Detective Google
81f7307575 yeah 2020-08-14 15:38:27 -05:00
Detective Google
83e1b4f0df woo yeah yeah woo 2020-08-14 15:07:22 -05:00
Lin
e1774fb56f Merge pull request #13133 from Citadel-Station-13/silicons-patch-7
clockwork chairs now keep spinning because it's no longer that laggy to maintain it since it's a processing system instead of while(TRUE) now
2020-08-14 13:00:12 -05:00
kiwedespars
61486f1287 adds custom parry data. 2020-08-14 01:59:46 -07:00
kiwedespars
53be29d9c2 Update dualsaber.dm 2020-08-14 01:43:47 -07:00
Hatterhat
d5b788a655 shortparry window restored, glaive parry req wield 2020-08-12 23:33:59 -05:00
Letter N
833aa86795 comment removal 2020-08-13 12:15:53 +08:00
Letter N
3ff770b38f wrong state 2020-08-13 12:13:42 +08:00
Letter N
2eb6eb5032 state moment 2020-08-13 12:01:36 +08:00
Letter N
8c26b883e9 open on init 2020-08-13 11:44:35 +08:00
Letter N
5727add7ab commit name 2020-08-13 11:41:33 +08:00
Letter N
1f2d9ca2ef jar moment 2020-08-12 19:35:24 +08:00
Letter N
081f07e259 bye! 2020-08-12 16:38:36 +08:00
silicons
3e67fd11e8 Update chair.dm 2020-08-11 23:39:31 -07:00
ancientpower
99d73388f8 lets ghosts see the contents of closets 2020-08-11 16:40:03 -05:00
silicons
a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
silicons
82824f9fb9 Merge pull request #13100 from lolzalolka/lean2
Suture/Mesh Crafting (take2)
2020-08-11 01:40:50 -07:00
Letter N
ab7c560f6d revert 2020-08-11 16:04:18 +08:00
silicons
5814eba033 Merge pull request #13103 from Hatterhat/oops-all-parries
funny timestop katana is less funny and more gameplay oriented
2020-08-10 23:30:30 -07:00
kiwedespars
036c7dbe39 Merge remote-tracking branch 'upstream/master' into heretics 2020-08-10 21:05:56 -07:00
kiwedespars
415e2556f9 descriptions, conflict, and actually puts requirements for the gamemode. 2020-08-10 20:59:51 -07:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Hatterhat
f4f8812318 whitespace (tm) 2020-08-10 11:30:36 -05:00
Hatterhat
4610908b8e Merge branch 'master' into parries-but-dumber 2020-08-10 11:29:27 -05:00
silicons
05290c85f3 Merge pull request #13094 from Hatterhat/tc-theft-patch
PDA Uplinks Can Now Siphon Pens
2020-08-10 02:30:11 -07:00