Commit Graph

2137 Commits

Author SHA1 Message Date
LetterJay
be70bbbd5c Merge pull request #1597 from Citadel-Station-13/GulimonsRus
Adds guilmon as a race (via Muffin)
2017-06-14 11:47:09 -05:00
LetterJay
67770a25be final commit(?) 2017-06-14 09:54:14 -05:00
LetterJay
ff8b2acf9e Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
2017-06-14 08:58:35 -05:00
LetterJay
c1af381233 Merge pull request #1460 from Citadel-Station-13/upstream-merge-28142
[MIRROR] Adds another parallax layer
2017-06-14 08:55:44 -05:00
LetterJay
5117b3ea88 Merge pull request #1458 from Citadel-Station-13/upstream-merge-28146
[MIRROR] Makes processing subsystems respect qdel and PROCESS_KILL
2017-06-14 08:54:17 -05:00
LetterJay
9df28d90bf Merge pull request #1456 from Citadel-Station-13/upstream-merge-28150
[MIRROR] Fixes CE's hand drill changing size
2017-06-14 08:54:05 -05:00
LetterJay
80be7ee88a Merge pull request #1455 from Citadel-Station-13/upstream-merge-28125
[MIRROR] I might HAVE accidently made dualwielding hilariously OP again so have a nerf!
2017-06-14 08:53:52 -05:00
LetterJay
0cadef3794 Merge pull request #1439 from Citadel-Station-13/upstream-merge-28102
[MIRROR] Graceful shutdown now asks the server to kill it
2017-06-14 08:52:02 -05:00
LetterJay
e1e60417f2 Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884
[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
2017-06-14 08:49:01 -05:00
LetterJay
7dcb2fa68e Update tables_racks.dm 2017-06-14 08:30:25 -05:00
LetterJay
2ff24e70a5 Merge pull request #1218 from Citadel-Station-13/upstream-merge-27686
[MIRROR] No more erros
2017-06-14 08:16:02 -05:00
LetterJay
5dc3c2987c Merge pull request #1593 from Citadel-Station-13/PanicBunker
Fixes the panic bunker age check
2017-06-14 06:43:54 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
2017-06-14 06:41:01 -05:00
LetterJay
ec415077c1 final commit for merge 2017-06-14 05:07:20 -05:00
LetterJay
848e32a87f Merge pull request #1590 from Citadel-Station-13/upstream-merge-28411
[MIRROR] ore coin crossed runtime fix
2017-06-14 05:05:37 -05:00
LetterJay
cd4dc1f1c6 this is why committing at 5am is a bad idea 2017-06-14 05:02:32 -05:00
LetterJay
28d726d1af Still need to fix the head. 2017-06-14 04:54:28 -05:00
CitadelStationBot
5c2acd599e [MIRROR] HOTFIX: Cult now gets a functioning summon objective (#1509)
* HOTFIX: Cult now gets a functioning summon objective

* Update datum_cult.dm

* Delete datum_cult.dm.rej
2017-06-13 20:40:49 -07:00
CitadelStationBot
e04f0310af ore coin crossed runtime fix 2017-06-13 21:02:34 -05:00
CitadelStationBot
97005222ff Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479) 2017-06-13 13:48:49 -07:00
CitadelStationBot
5db49fb44b Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430) 2017-06-13 13:48:36 -07:00
CitadelStationBot
44f4059968 Weaponizes station charters (#1449) 2017-06-13 13:47:17 -07:00
CitadelStationBot
8157797dff Fixes #28175 : Adds a light to the ash walker nest. (#1477) 2017-06-13 13:46:58 -07:00
CitadelStationBot
6b79f26c9b Fix #28176 : You can EMP Proof a camera with a sheet of plasma (#1478) 2017-06-13 13:46:42 -07:00
CitadelStationBot
e9f3bc7f1e Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones (#1453) 2017-06-13 13:46:20 -07:00
CitadelStationBot
4ef7ad7724 Flashlight suduko (#1426) 2017-06-13 13:45:58 -07:00
CitadelStationBot
183ce05921 Lowers Uranium virology reagents down to 1 from 5 (#1451) 2017-06-13 13:44:58 -07:00
CitadelStationBot
afd9131e2f Changeling transform sting is stealthy again (#1448) 2017-06-13 13:44:28 -07:00
CitadelStationBot
f5dda16b01 Removes legacy LateInitialize support (#1452) 2017-06-13 13:44:11 -07:00
CitadelStationBot
16f968f5e5 Some other code now uses ai status display list (#1506) 2017-06-13 13:43:04 -07:00
CitadelStationBot
bb30963100 Fixes shooting self while suiciding with gun without proper firing pin auth (#1520) 2017-06-13 13:42:15 -07:00
CitadelStationBot
c9e8454c3b Deepstorage Ruin Revamp (#1407) 2017-06-13 13:42:03 -07:00
CitadelStationBot
b47109a54c ayys are more likely to visit the station (#1368) 2017-06-13 13:40:54 -07:00
CitadelStationBot
33eb60747f Refactored advanced camera consoles (#1576) 2017-06-13 13:39:47 -07:00
LetterJay
c9e6257957 Merge pull request #1577 from Citadel-Station-13/upstream-merge-28367
[MIRROR] Fixes admin being unable to see each other's PMs
2017-06-13 12:54:27 -05:00
CitadelStationBot
a5a24e3955 Fixes admin being unable to see each other's PMs 2017-06-13 09:59:01 -05:00
CitadelStationBot
811a25a3bb Makes game world plane use client color 2017-06-13 07:13:39 -05:00
LetterJay
d5807f3a62 Merge pull request #1567 from Citadel-Station-13/upstream-merge-28368
[MIRROR] Fixes MC panel Location not working while inside containers
2017-06-13 06:37:37 -05:00
LetterJay
d97399169b Merge pull request #1565 from Citadel-Station-13/upstream-merge-28364
[MIRROR] Fixes gang turrets buckle code (atleast most of it)
2017-06-13 06:12:37 -05:00
LetterJay
49c35e6848 Merge pull request #1560 from Citadel-Station-13/upstream-merge-28225
[MIRROR] New Ahelp IRC functions
2017-06-13 06:12:22 -05:00
LetterJay
d82577a22a Merge pull request #1564 from Citadel-Station-13/upstream-merge-28363
[MIRROR] Fixes buildmode help text
2017-06-13 02:47:26 -05:00
CitadelStationBot
9ba274a3da Fixes MC panel Location not working while inside containers 2017-06-13 02:45:50 -05:00
CitadelStationBot
b666e5977c Fixes gang turrets buckle code (atleast most of it) 2017-06-13 02:34:27 -05:00
CitadelStationBot
0ff5c60acb Fixes buildmode help text 2017-06-13 02:30:20 -05:00
CitadelStationBot
9c31812e5b Fixes dead PKborgs having active dampener fields 2017-06-13 02:24:06 -05:00
LetterJay
226345d82a upstream-merge-28109
upstream-merge-28352
2017-06-13 01:10:21 -05:00
LetterJay
32c576b7cf Merge pull request #1444 from Citadel-Station-13/upstream-merge-28114
[MIRROR] gas miners only update overlays when they actually need to
2017-06-13 00:58:39 -05:00
LetterJay
47d1d96082 Merge pull request #1557 from Citadel-Station-13/upstream-merge-28352
[MIRROR] Flashdarks can't be used for examining eyes/mouth.
2017-06-13 00:58:10 -05:00
LetterJay
c720fb8d72 Merge pull request #1425 from Citadel-Station-13/upstream-merge-28068
[MIRROR] Add status string for server tools
2017-06-13 00:50:20 -05:00
LetterJay
e66e029108 Merge pull request #1537 from Citadel-Station-13/upstream-merge-28299
[MIRROR] Clarification on hardsuit variants in traitor uplink
2017-06-13 00:49:08 -05:00