 ZeroMan
|
18eb42315e
|
i missed a src
|
2020-04-28 02:55:25 -04:00 |
|
|
ZeroMan
|
8dc130175d
|
i actually despise coding
|
2020-04-28 02:46:46 -04:00 |
|
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
Trilbyspaceclone
|
2ebf23a32d
|
Update utility_closets.dm
|
2020-04-14 10:12:27 -04:00 |
|
|
Trilbyspaceclone
|
5833ed8029
|
Merge branch 'master' into tools_andstuff
|
2020-04-14 10:10:32 -04:00 |
|
|
Ghom
|
a96f6238df
|
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
[Ready]Better crate options
|
2020-04-12 05:48:20 +02:00 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
|
TrilbySpaceClone
|
1f51e73dd6
|
more rng
|
2020-04-07 08:43:18 -04:00 |
|
|
Ghommie
|
86898cc451
|
Force pushed updates
|
2020-03-22 01:43:19 +01:00 |
|
|
necromanceranne
|
94c700a06c
|
NVG Nerf/Syndicate NVG Buff (#11548)
* nerfs the shit out of nvg and gives syndicate special flashproof versions
* forgot about this one
* bleh
|
2020-03-21 15:31:59 +01:00 |
|
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
|
Ghommie
|
a817bd6115
|
Porting the musician and curator beacons.
|
2020-03-07 00:12:50 +01:00 |
|
|
Trilbyspaceclone
|
178de5ee0d
|
Merge branch 'master' into more_crates+bags
|
2020-03-06 06:31:54 -05:00 |
|
|
kevinz000
|
8b0b685fa7
|
CHECK_MOBILITY
|
2020-03-03 20:40:33 -07:00 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
|
ancientpower
|
5c5ec541ae
|
Merge branch 'master' into paramedic-tweaks
|
2020-02-29 01:55:46 -06:00 |
|
|
Lin
|
5ee4a355c1
|
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
Fixing refrigerators locking when closed
|
2020-02-29 00:21:43 -06:00 |
|
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
|
kevinz000
|
59e95555bb
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-24 13:09:45 -07:00 |
|
|
Trilbyspaceclone
|
becdd3c4c1
|
Merge branch 'master' into more_crates+bags
|
2020-02-22 18:33:26 -05:00 |
|
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
|
Ghom
|
503214dee6
|
Update freezer.dm
|
2020-02-21 02:26:52 +01:00 |
|
|
Ghom
|
89f256866d
|
Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
|
2020-02-20 11:24:50 +01:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
kevinz000
|
8666a36b1e
|
fixes most things
|
2020-02-18 02:24:31 -07:00 |
|
|
kevinz000
|
d7949e810e
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-18 02:20:58 -07:00 |
|
|
kevinz000
|
7ee04aa608
|
Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
|
2020-02-15 12:17:37 -07:00 |
|
|
kevinz000
|
70e752dbc9
|
this is totally not laggy
|
2020-02-11 23:45:22 -07:00 |
|
|
ShadeAware
|
bbedf617f5
|
Declutters the Locker
|
2020-02-11 17:33:18 -05:00 |
|
|
Ghommie
|
c34714cb90
|
Something about the in operator and spaceDMM version update.
|
2020-02-10 07:37:59 +01:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
kevinz000
|
f3d955f397
|
Merge branch 'master' into staves
|
2020-02-04 14:54:35 -07:00 |
|
|
TrilbySpaceClone
|
c8dff8fbc5
|
it just works
|
2020-02-04 04:18:44 -05:00 |
|
|
kevinz000
|
8556bcf2b3
|
compile
|
2020-02-03 13:36:10 -07:00 |
|
|
kevinz000
|
3e30c9409b
|
riot staves
|
2020-02-03 13:11:26 -07:00 |
|
|
Seris02
|
dbb6218e0d
|
merp
|
2020-01-30 14:54:07 +08:00 |
|
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
r4d6
|
ce16c91b2f
|
Code changes
|
2020-01-16 14:08:14 -05:00 |
|
|
kevinz000
|
26525b8fa7
|
s
|
2020-01-16 00:14:03 -07:00 |
|
|
Ghommie
|
9dad810edf
|
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:11:02 +01:00 |
|
|
Ghommie
|
b2ab8959f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:00:05 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
Ghom
|
34502cab1d
|
Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
|
2020-01-11 15:29:25 +01:00 |
|
|
kevinz000
|
2c245a18fd
|
compile
|
2020-01-10 13:43:53 -08:00 |
|
|
kevinz000
|
dbd2cb6195
|
Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
|
2020-01-08 13:31:55 -08:00 |
|
|
Seris02
|
5fae814e42
|
did it thanks
|
2020-01-07 17:52:46 +08:00 |
|