keronshb
|
7e1e905a95
|
Line ending changes, I hope
here goes nothing.
|
2020-03-08 20:36:05 -04:00 |
|
keronshb
|
0d3da4fcc0
|
maybe? last go? 2
Should be the final part I hope
|
2020-03-08 20:11:13 -04:00 |
|
keronshb
|
94958581b9
|
maybe? last go?
maybe? last go?
|
2020-03-08 20:10:34 -04:00 |
|
keronshb
|
d460f5359e
|
Hopefully this will fix it?
Hopefully this will fix it?
|
2020-03-08 18:49:18 -04:00 |
|
keronshb
|
9b63c7aa11
|
Trying to see if this will fix the line end issue
Trying to see if this will fix the line end issue
|
2020-03-08 18:48:42 -04:00 |
|
keronshb
|
228012c718
|
Blob refactor (#43872)
Ports over Blob Refactor from TG
|
2020-03-06 15:58:17 -05:00 |
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
Kraseo
|
e3c77f2f5a
|
part 4: the one where i slowly go insane
|
2020-03-01 22:05:35 +01:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
Ghommie
|
2b740f9bad
|
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 13:09:21 +01:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
34fbcd1dc0
|
fixes
|
2020-02-19 07:49:05 -07:00 |
|
kevinz000
|
d2398f4584
|
Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
Porting agent card updates and registered name fix.
|
2020-02-15 11:45:39 -07:00 |
|
Ghom
|
ad639d5f2f
|
Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7
!tgs valentine
|
2020-02-15 09:04:29 +01:00 |
|
kevinz000
|
f36b89a6e3
|
Update misc.dm
|
2020-02-14 11:53:50 -07:00 |
|
kevinz000
|
efc94565b6
|
Update misc.dm
|
2020-02-14 00:40:50 -07:00 |
|
kevinz000
|
e9baf17233
|
Update misc.dm
|
2020-02-14 00:40:19 -07:00 |
|
Artur
|
7964d768fa
|
Initial Commit
|
2020-02-13 20:51:52 +02:00 |
|
Ghom
|
bcc7949034
|
Update names.dm
|
2020-02-13 18:02:42 +01:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
Ghom
|
6f66d76680
|
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
|
2020-02-02 19:08:57 +01:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
kevinz000
|
24cbe67f27
|
optimizations, unnecessary crap, undocumented ipc change
|
2020-01-24 21:18:19 -07:00 |
|
kevinz000
|
74a3b4e656
|
Update logging.dm
|
2020-01-24 04:13:20 -07:00 |
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01:00 |
|
Putnam
|
a4cc73f219
|
some craft logging
|
2020-01-16 18:40:00 -08:00 |
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
kevinz000
|
fa7dcad49a
|
compile
|
2020-01-07 04:54:11 -08:00 |
|
Putnam
|
adf87c7595
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2020-01-02 22:52:24 -08: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
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01:00 |
|
Putnam
|
90ebbdfdb9
|
elements are so good. they're so good
|
2019-12-30 00:53:03 -08:00 |
|
Seris02
|
a39c0249c4
|
marshmallow
|
2019-12-29 21:55:25 +08:00 |
|
Lin
|
1931a2f715
|
Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
|
2019-12-25 19:03:42 +00:00 |
|
Ghom
|
e7cf680ca7
|
Merge pull request #10266 from shellspeed1/master
New insect marking customization option and three new wings.
|
2019-12-25 03:43:29 +01:00 |
|
shellspeed1
|
1875ea3f58
|
new wings and fluff
|
2019-12-21 23:47:41 -08:00 |
|
r4d6
|
ac1719810f
|
Adding a list for the stations rooms
|
2019-12-19 15:23:23 -05:00 |
|
Ghommie
|
fb2b259d92
|
Ports "Refactors can_see_reagents"
|
2019-12-19 17:17:18 +01:00 |
|
Ghommie
|
8566e2396d
|
Brings in some mapping code updates.
|
2019-12-19 00:44:14 +01:00 |
|
Ghommie
|
8ec4bdaef5
|
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2019-12-13 02:30:11 +01:00 |
|
kevinz000
|
b5595114c1
|
Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
|
2019-12-05 21:40:09 -07:00 |
|
Putnam3145
|
44c621e5e9
|
Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
|
2019-11-30 22:22:52 -08:00 |
|
Linzolle
|
829cc3d81c
|
Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
|
2019-11-27 20:23:33 -06:00 |
|
kevinz000
|
8b56e25d97
|
Merge pull request #9920 from YakumoChen/ai-sprites
Ports a bunch of VG's AI sprites
|
2019-11-26 15:59:09 -07:00 |
|