silicons
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -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 |
|
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
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
Sishen
|
1bd30ddf41
|
value tweak, add forced 2h
|
2020-08-07 21:52:16 -06:00 |
|
silicons
|
d6a5442a37
|
fix
|
2020-08-06 12:00:15 -07:00 |
|
silicons
|
2a0f2a38a7
|
Fix
|
2020-08-05 21:42:05 -07:00 |
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
Sishen
|
ec8cd31950
|
funny chair loses block chance and gains active block/parry
|
2020-08-05 14:21:48 -06:00 |
|
Timothy Teakettle
|
ef53f3faea
|
the old system isnt needed really but sure i guess
|
2020-08-04 11:43:15 +01:00 |
|
Letter N
|
a19e306137
|
less redtext - updates anomalies
|
2020-08-03 20:53:36 +08:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08: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 |
|
silicons
|
8313485632
|
fix
|
2020-07-28 11:31:28 -07:00 |
|
Timothy Teakettle
|
dc14c02570
|
fix crates
|
2020-07-27 21:55:51 +01:00 |
|
Ghommie
|
f1c242aadc
|
Fixing new bugs and stuff.
|
2020-07-27 14:16:01 +02:00 |
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
Letter N
|
8e177bf01e
|
another batch - MAJOR: teleportaiton, displaycase (ico port needed),
|
2020-07-24 19:58:48 +08:00 |
|
silicons
|
64de8f16a9
|
fixes
|
2020-07-23 16:59:27 -07:00 |
|
silicons
|
9c9014acdb
|
crate fix
|
2020-07-23 16:19:07 -07:00 |
|
Lin
|
8a25582c1c
|
Merge pull request #12850 from silicons/drag
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
|
2020-07-23 17:13:48 -05:00 |
|
silicons
|
db24df58a0
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:36:46 -07:00 |
|
silicons
|
11a4dfd20b
|
Merge pull request #12861 from Sneakyrat6/dresserFix
Fixes dressers not giving you undies
|
2020-07-23 10:28:54 -07:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
Sneakyrat6
|
402f13ce1b
|
Fixes dressers not giving you undies
|
2020-07-21 20:33:58 -05:00 |
|
silicons
|
4d48abf3a6
|
fixes
|
2020-07-21 11:46:17 -07:00 |
|
silicons
|
1450b11b01
|
sigh
|
2020-07-20 21:37:44 -07:00 |
|
silicons
|
692656b02d
|
Whew
|
2020-07-20 11:53:33 -07:00 |
|
silicons
|
526d257410
|
fix
|
2020-07-20 11:48:08 -07:00 |
|
silicons
|
416b989e12
|
changes
|
2020-07-20 11:35:10 -07:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
silicons
|
58e26c540c
|
merge from master
|
2020-07-20 10:18:44 -07:00 |
|
Timothy Teakettle
|
a8d2f558bc
|
use old table pushing
|
2020-07-19 17:53:25 +01:00 |
|
Timothy Teakettle
|
ca6b289da6
|
fix tables and some minor thing
|
2020-07-19 17:49:22 +01:00 |
|
silicons
|
55f8e37544
|
sigh
|
2020-07-18 20:26:11 -07:00 |
|
silicons
|
1a040dd2a6
|
changes
|
2020-07-18 18:44:17 -07:00 |
|
silicons
|
0b98b0409b
|
sigh
|
2020-07-18 18:29:09 -07:00 |
|
silicons
|
7c5d4f863d
|
click cd breakout
|
2020-07-18 18:10:21 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Lin
|
ba3dc6a73b
|
Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
|
2020-07-18 17:02:02 -05:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
BlackMajor
|
bd7c9d11d3
|
oh no
|
2020-07-16 02:02:29 +12:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|