nik707
|
09c8bd40ec
|
Merge pull request #11575 from EmeraldSundisk/coggers
as of yet unfinished, being added in the background for ease of further development
|
2020-04-04 13:18:07 -05:00 |
|
Timothy Teakettle
|
b51dd7dc70
|
make the new holodeck an option
|
2020-03-28 22:24:47 +00:00 |
|
EmeraldSundisk
|
bc6b217565
|
minimapfix
|
2020-03-19 15:27:54 -07:00 |
|
EmeraldSundisk
|
6855d2d9a4
|
Let's try this again.
|
2020-03-18 14:29:34 -07:00 |
|
kevinz000
|
14b22f0b67
|
Merge remote-tracking branch 'citadel/master' into minimaps
|
2020-03-11 17:32:15 -07:00 |
|
kevinz000
|
02a488f507
|
Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
|
2020-03-07 03:26:48 -07:00 |
|
Kraseo
|
87773343c1
|
marks area/ruin/space as outdoors so it's not a valid dropoff location
|
2020-03-06 12:08:32 +01:00 |
|
Ghommie
|
0c4af362bc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605
|
2020-03-06 04:00:36 +01:00 |
|
Ghommie
|
e484f72d7b
|
Ports movespeed modifiers code updates.
|
2020-03-06 03:35:56 +01:00 |
|
Ghom
|
d78cdb9b37
|
Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
|
2020-03-04 23:46:10 +01:00 |
|
kevinz000
|
8923b7e72d
|
minimaps
|
2020-03-04 01:21:16 -07:00 |
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
BlackMajor
|
be740ba690
|
Merge branch 'master' into SpaceRuins
|
2020-02-26 20:58:46 +13:00 |
|
BlackMajor
|
6624155e3d
|
Hey you know this is probably a smarter way to go about ruin spawning in station space.
|
2020-02-25 02:21:28 +13:00 |
|
Persi
|
4af2eee9dd
|
Haha, okay... this will break Kilo
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
|
2020-02-23 02:28:18 -05:00 |
|
Persi
|
c4b4a90bd8
|
Oh hey it's KiloStation
Trying to make Kilo open...
Finally, the work begins!
Kilo added!
Kilo Station!
|
2020-02-20 00:58:54 -05:00 |
|
kevinz000
|
dc3e5e24fd
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-25 19:36:06 -07:00 |
|
Ghommie
|
b1a4cc0406
|
renormalize
|
2020-01-20 21:17:06 +01:00 |
|
Ghommie
|
5644617786
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2020-01-20 20:59:38 +01:00 |
|
kevinz000
|
5d485a95c3
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-19 20:25:51 -07:00 |
|
Detective Google
|
2c4daf3a99
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-13 16:32:18 -06:00 |
|
kevinz000
|
8f5d4a0a49
|
Merge remote-tracking branch 'citadel/master' into nightshift_1
|
2020-01-12 18:27:03 -08:00 |
|
Detective Google
|
6589065c38
|
scream
|
2020-01-12 15:25:51 -06:00 |
|
Detective Google
|
97c26c704d
|
Update Space_Station_13_areas.dm
|
2020-01-12 15:24:51 -06:00 |
|
Detective Google
|
81d3225819
|
?
|
2020-01-12 15:23:45 -06:00 |
|
Detective Google
|
99ba77ce01
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
2020-01-12 15:23:05 -06:00 |
|
Detective Google
|
c7dcd0c8a3
|
grug hates merge conflicts
|
2020-01-12 15:19:44 -06:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Detective Google
|
d5b227a0ca
|
adds the POOL to box station
F in chat for dorms 7.
|
2020-01-11 23:34:07 -06:00 |
|
kevinz000
|
8e1affa1f5
|
nightshift changes
|
2020-01-02 23:56:40 -08:00 |
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
Ghommie
|
93fbc17428
|
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-16 17:58:50 +01:00 |
|
Ghommie
|
e1998e1bab
|
set the sub areas fire var before the fire alarms update their icons.
|
2019-12-12 23:16:06 +01:00 |
|
Ghommie
|
7a3cb3bd58
|
Oversight.
|
2019-12-11 19:17:44 +01:00 |
|
Ghommie
|
e35db533fe
|
ready.
|
2019-12-11 17:48:54 +01:00 |
|
Ghommie
|
bafd03bc19
|
Mapping.
|
2019-12-11 12:11:09 +01:00 |
|
Ghommie
|
8ed21b47b6
|
Grammar and something.
|
2019-12-10 16:20:57 +01:00 |
|
Ghommie
|
19a3aca619
|
I fear for my powernet
|
2019-12-10 15:33:15 +01:00 |
|
kevinz000
|
178aedc5cc
|
Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
|
2019-11-14 16:38:27 -07:00 |
|
Ghommie
|
f55a602319
|
Unmodularize areas.
|
2019-11-13 06:13:18 +01:00 |
|
Ghommie
|
9591bb5471
|
porting "global to static"
|
2019-11-09 22:53:56 +01:00 |
|
Persi
|
db1f459151
|
Set clockcult teleport in Captain's Quarters to false.
|
2019-10-12 03:01:52 -04:00 |
|
Seris02
|
59f45d3e35
|
adds abductor replication lab with advanced tools
|
2019-07-15 15:18:04 +08:00 |
|
Ghom
|
2845428c03
|
ports "Improve efficiency of SSmapping init" (#8651)
|
2019-06-17 11:18:28 -07:00 |
|
Ghommie
|
b5e3da68bd
|
Ports "areas_in_z after start population fix"
|
2019-06-16 08:45:37 +02:00 |
|
kevinz000
|
1034a6ad0e
|
ball stuff
|
2018-12-16 03:41:37 -08:00 |
|
Poojawa
|
d231018a3a
|
Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
|
2018-09-21 02:48:17 -05:00 |
|
Poojawa
|
8b9ef1e400
|
Game folder
|
2018-09-11 04:06:45 -05:00 |
|
kevinz000
|
b99556c70f
|
Nanites port from /tg/station, original coder XDTM
|
2018-08-23 01:16:32 -07:00 |
|
deathride58
|
91805b8789
|
and that just leaves the modules folder
|
2018-07-02 00:28:51 -04:00 |
|