 Artur
|
fe92573fc3
|
Forgot this
|
2020-02-02 13:44:44 +01:00 |
|
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
|
Ghommie
|
7f14fa3c71
|
not-so-wip now.
|
2020-01-31 19:20:59 +01:00 |
|
|
Artur
|
db36a90e35
|
Fixes.
|
2020-01-30 19:23:38 +01:00 |
|
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
|
Seris02
|
ab771d9505
|
I deleted an important thing
|
2020-01-20 15:48:55 +08:00 |
|
|
Seris02
|
afd848e45a
|
weh
|
2020-01-20 10:29:09 +08:00 |
|
|
Artur
|
d04c09aba0
|
Compiles, just need to fix goonchat
|
2020-01-15 09:44:03 +02:00 |
|
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
Lin
|
f7b91f9b65
|
Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
|
2020-01-03 00:01:54 +00:00 |
|
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
|
Ghom
|
a7cda1aea0
|
Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
|
2019-12-21 11:05:36 +01:00 |
|
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +01:00 |
|
|
Ghommie
|
8566e2396d
|
Brings in some mapping code updates.
|
2019-12-19 00:44:14 +01:00 |
|
|
kevinz000
|
ded283fa55
|
Update conveyor2.dm
|
2019-12-11 14:41:58 -07:00 |
|
|
kevinz000
|
20defaba8e
|
Update conveyor2.dm
|
2019-12-08 21:46:53 -07:00 |
|
|
Ghommie
|
542c9007ee
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-06 20:09:35 +01:00 |
|
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01:00 |
|
|
lolman360
|
dc1c17226d
|
Merge branch 'master' into HeadCorgi
|
2019-11-28 08:45:19 +11:00 |
|
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
|
lolman360
|
216790d442
|
Merge branch 'master' into HeadCorgi
|
2019-11-22 21:54:05 +11:00 |
|
|
Ghommie
|
dd101ef221
|
Part 2
|
2019-11-19 18:00:56 +01:00 |
|
|
lolman360
|
4d71f95b16
|
Merge branch 'master' into HeadCorgi
|
2019-11-17 12:24:04 +11:00 |
|
|
lolman360
|
aed866339f
|
pickup pickup pickup pickup 100% pickup
|
2019-11-17 12:00:17 +11:00 |
|
|
GrayRachnid
|
3edaf75722
|
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
|
2019-11-15 16:58:45 -05:00 |
|
|
Ghommie
|
6484eea339
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-15 00:36:50 +01:00 |
|
|
kevinz000
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07:00 |
|
|
Ghommie
|
592d1a4b54
|
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
|
2019-11-03 01:55:59 +01:00 |
|
|
Ghommie
|
5fcf5b1c5e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-10-29 13:38:16 +01:00 |
|
|
Ghommie
|
4aa1d55abb
|
Porting multi-z support updates.
|
2019-10-27 16:32:32 +01:00 |
|
|
Ghommie
|
2c578ca683
|
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2019-10-24 18:01:46 +02:00 |
|
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
|
Ghommie
|
4855474955
|
Making sure altdisarm() works as intended.
|
2019-10-02 19:39:23 +02:00 |
|
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
|
Ghommie
|
d2300765b2
|
adjacency checks.
|
2019-10-01 23:16:47 +02:00 |
|
|
Ghommie
|
cfcd325778
|
reworking the shoving people action.
|
2019-10-01 23:13:08 +02:00 |
|
|
Alonefromhell
|
eee1ccbe2c
|
merge oracle ui from kepler
|
2019-09-04 11:42:04 -05:00 |
|
|
deathride58
|
0f48e77990
|
makes the sound actually play at the right place
|
2019-01-11 04:58:11 -05:00 |
|
|
deathride58
|
37d90a780a
|
all items in disposal pipes now make small sounds when they hit corners. all mobs will make very audible sounds when they hit corners
|
2019-01-11 04:27:53 -05:00 |
|
|
deathride58
|
0ce450eab8
|
tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory
|
2018-10-02 19:36:21 -04:00 |
|
|
Poojawa
|
284e9d0325
|
module things, jfc
|
2018-09-11 07:51:01 -05:00 |
|
|
deathride58
|
b1688405d9
|
and finally, the modules folder. Now I can publish and take a break
|
2018-07-02 01:19:37 -04:00 |
|
|
deathride58
|
e279392386
|
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
|
2018-06-09 05:53:25 +00:00 |
|
|
Jordan Brown
|
5e15a988f6
|
Refactor machinery to default to being anchored
|
2018-06-01 11:28:19 -05:00 |
|
|
ShizCalev
|
4ae974644c
|
Standardizes and cleans up some admin messages & logging
|
2018-05-31 22:41:31 -05:00 |
|
|
deathride58
|
6a07a66cb3
|
Merge branch 'master' into upstream-merge-37476
|
2018-05-06 07:07:02 +00:00 |
|