Commit Graph

1341 Commits

Author SHA1 Message Date
CitadelStationBot
8a1a4dd671 Hand drill, jaws of life, and emitter grammar tweaks 2017-06-16 15:19:22 -05:00
LetterJay
999237e578 Merge pull request #1620 from Citadel-Station-13/upstream-merge-28468
[MIRROR] Fixes ExportService running even when not using TGS3
2017-06-16 11:10:47 -05:00
LetterJay
de151d6a58 Merge pull request #1618 from Citadel-Station-13/upstream-merge-28457
[MIRROR] Welder sprites properly update upon refilling at a fueltank.
2017-06-16 11:10:09 -05:00
CitadelStationBot
58e9b0e05a Fixes ExportService running even when not using TGS3 2017-06-15 21:01:05 -05:00
CitadelStationBot
ef8f730ef0 Welder sprites properly update upon refilling at a fueltank. 2017-06-15 20:49:45 -05:00
CitadelStationBot
db01827ede Examining an ore box you are adjacent to shows its contents. 2017-06-15 20:26:14 -05:00
CitadelStationBot
ca6b27a482 Fixes high luminosity eyes (#1603) 2017-06-14 19:53:36 -07:00
LetterJay
310ff0ea94 Merge pull request #1599 from Verkister/master
A new dogborgo.
2017-06-14 16:38:56 -05:00
Verkister
bac4cebfe8 removed a twig fro mthe gearbox. 2017-06-14 23:43:21 +03:00
Verkister
4f3d39c693 A new dogborgo.
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.
2017-06-14 23:13:38 +03:00
LetterJay
c877fdb501 Merge branch 'master' into upstream-merge-28046 2017-06-14 13:10:37 -05:00
LetterJay
defb7d75c1 Merge pull request #1598 from Citadel-Station-13/SyndicateStuff
New syndicate cosmetics, turfs, and spawners.
2017-06-14 12:28:08 -05:00
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
74e6bc7ee2 Merge branch 'master' into SyndicateStuff 2017-06-14 11:44:32 -05:00
LetterJay
813bcc2b8d commit 2017-06-14 11:16:54 -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
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
815c4500bc Delete lavaland_ruin_code.dm.rej 2017-06-14 08:27:05 -05:00
LetterJay
9d747590a0 Create lavaland_ruin_code.dm 2017-06-14 08:26:14 -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
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
e04f0310af ore coin crossed runtime fix 2017-06-13 21:02:34 -05: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
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
183ce05921 Lowers Uranium virology reagents down to 1 from 5 (#1451) 2017-06-13 13:44:58 -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
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
CitadelStationBot
a5a24e3955 Fixes admin being unable to see each other's PMs 2017-06-13 09:59:01 -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
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
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
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
CitadelStationBot
82a1a5c03b New Ahelp IRC functions 2017-06-12 19:22:48 -05:00
CitadelStationBot
ef0254b32d Workaround for byond bug causing clients to flood the server with repeated asset cache arrival messages 2017-06-12 18:25:51 -05:00
LetterJay
2a5be91970 compile fixes 2017-06-12 16:12:00 -05:00
CitadelStationBot
b2fc9c4dee Outfits janitor cyborgs with a screwdriver, crowbar, and floor tiles 2017-06-12 15:34:37 -05:00
LetterJay
276bb8b786 Merge pull request #1483 from Citadel-Station-13/upstream-merge-28185
[MIRROR] Fixes ghosts not returning an initialize hint
2017-06-12 12:44:10 -05:00