Lin
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
silicons
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
silicons
1f25c7f06d
Merge remote-tracking branch 'citadel/master' into shoelaces
2020-07-23 16:23:34 -07:00
silicons
03f0d76a8e
yeah ok
2020-07-23 13:23:45 -07:00
silicons
cbe0cad1a4
fix
2020-07-23 12:41:33 -07:00
silicons
758d746e96
compile
2020-07-23 12:25:02 -07:00
silicons
59bd63471e
sigh
2020-07-23 12:23:13 -07:00
silicons
5d7dfd327c
FUCK
2020-07-23 12:22:55 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
9a5e53a21f
ok
2020-07-21 11:57:47 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
timothyteakettle
8709a72fc0
fry everything
2020-07-20 00:40:18 +01: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
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
silicons
484da28600
Merge branch 'master' into shoelaces
2020-07-16 17:31:41 -07:00
Artur
d0f1a805e4
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-14 16:15:48 +03:00
silicons
047a36c973
fix
2020-07-12 05:37:07 -07:00
silicons
72c5c2234e
ok
2020-07-12 05:15:55 -07:00
silicons
3d80792e79
more
2020-07-11 00:37:56 -07:00
Artur
a304ed7f49
Canister and paper updates
...
should fix papah exploits, though some runtiming is occuring
2020-07-04 16:14:42 +03:00
Artur
7781296fb9
DNA CONSOLE FIX
2020-07-03 11:09:55 +03:00
Artur
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
Ghommie
f7de8034a1
Put an end to the null stack traces from icon2html's register_asset.
2020-07-01 19:26:09 +02:00
Ghommie
94f7dae62e
Porting "Fix asset cache verification" and other tiny bits.
2020-07-01 16:24:12 +02:00
Artur
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
Putnam3145
42809d8b0c
Merge pull request #12416 from Ghommie/Ghommie-cit792
...
TGUI-next Check Skills menu.
2020-06-29 12:44:08 -07:00
Ghommie
5307676317
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
2020-06-29 06:55:35 +02:00
Artur
765ffdb1a1
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
silicons
46acf770b4
Update roundend.dm
2020-06-25 14:00:37 -07:00
silicons
03c9762dcf
Update files.dm
2020-06-24 12:11:49 -07:00
Detective Google
da68163c80
ghosts now appear at round-end
2020-06-22 15:43:32 -05:00
Artur
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
Artur
66cbdd1174
Fixes the dreaded examine bug
2020-06-22 17:25:40 +03:00
Ghom
e31ce2edcf
Merge pull request #12414 from LetterN/asset-cache-thing
...
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
Artur
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
Timothy Teakettle
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
Ghommie
02a21081a6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
2020-06-15 02:21:21 +02:00
Lin
bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Timothy Teakettle
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
Artur
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
Ghom
798de9baf1
Porting "Speeds up /datum/light_source/proc/update_corners() by 16% or so" ( #12496 )
2020-06-08 21:15:26 -07:00
Ghom
911e45e526
Merge pull request #12443 from timothyteakettle/fix-blueprints
...
fixes dumb blueprint bug to do with noteleport
2020-06-08 00:38:02 +02:00
Yawet330
fabfd684ce
Silicon Flavortexts. (SCRUTINISE HEAVILY) ( #12395 )
...
* Part 1 - Adding the component
* Part 2 - Making the WRITE_FILE before changing the pref menu.
* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction
* Part 4 - Changes the preference tab to accomodate this.
* we made a brief fucky wucky!
* make it look noice
* fuckywucky mk2
* Part 5 - make it apart of the helper list (woops)
* that'yll do it.
* maybe fix?
* nope, just hit the delete button on their flavortext entirely :agony:
* Update preferences_savefile.dm
* Update silicon.dm
* Update preferences.dm
* Update silicon.dm
2020-06-04 15:53:39 -07:00
Timothy Teakettle
ee2a2a30e4
easy fix
2020-06-04 17:18:44 +01:00
Ghommie
2f3fd48b84
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
2020-05-31 16:08:52 +02:00
Letter N
151df41d1c
asset cache + better minimaps
2020-05-31 16:15:09 +08:00
Ghommie
949e8f6b3a
WIP
2020-05-30 21:53:14 +02:00
Artur
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
kevinz000
6cf59ad115
woops
2020-05-27 23:24:50 -07:00
