shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,026 Commits 5 Branches 0 Tags
c53efc8dc7e3972f8974ab4e4490010e1cb34b21
Commit Graph

1359 Commits

Author SHA1 Message Date
CitadelStationBot
c53efc8dc7 Fixes a to_chat runtime, adds macro for sending images (#1591) 2017-06-17 13:26:42 -07:00
CitadelStationBot
7162120fc4 Adds screaming for burns (#1645) 2017-06-17 13:25:55 -07:00
CitadelStationBot
08a0ba5692 Fix some things assuming lighting corners existed (#1642) 2017-06-17 13:17:21 -07:00
CitadelStationBot
b5a5b4aada Prevents negative tempban duration (#1624) 2017-06-17 13:15:51 -07:00
LetterJay
0c5773f70f Merge pull request #1641 from Citadel-Station-13/upstream-merge-28499 
[MIRROR] Fixes various bugs with photos and photo copying.
 2017-06-17 10:06:38 -05:00
LetterJay
dfabe6ccf7 Merge pull request #1639 from Citadel-Station-13/upstream-merge-28503 
[MIRROR] Fixes #28500 : Cryo cells properly compare to a mob's max health
 2017-06-17 10:06:14 -05:00
LetterJay
97fe740ac9 Merge pull request #1635 from Citadel-Station-13/upstream-merge-28495 
[MIRROR] Removes tech requirement from flashes
 2017-06-17 10:05:31 -05:00
LetterJay
a1bd66ef8b Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414 
[MIRROR] Adds onions
 2017-06-17 10:04:59 -05:00
LetterJay
0b136e2349 Merge pull request #1633 from Citadel-Station-13/upstream-merge-28445 
[MIRROR] Cult Master is now given a Suffix in Check Antags
 2017-06-17 10:04:19 -05:00
LetterJay
050a6bfcdb Merge pull request #1632 from Citadel-Station-13/upstream-merge-28466 
[MIRROR] Adjusted atmos device layers + added new pipe subtypes
 2017-06-17 10:03:54 -05:00
LetterJay
67db8fc9ad Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492 
[MIRROR] Vomit fix
 2017-06-17 10:03:11 -05:00
CitadelStationBot
d874e9ba3a Fixes various bugs with photos and photo copying. 2017-06-17 07:37:31 -05:00
CitadelStationBot
c3fe3f674f Fixes #28500 : Cryo cells properly compare to a mob's max health 2017-06-17 07:36:24 -05:00
CitadelStationBot
9273f20ff3 Removes tech requirement from flashes 2017-06-16 16:25:44 -05:00
CitadelStationBot
f86bda7cda Adds onions 2017-06-16 16:22:38 -05:00
CitadelStationBot
4defe37c41 Cult Master is now given a Suffix in Check Antags 2017-06-16 16:09:22 -05:00
CitadelStationBot
185d0cd3f4 Adjusted atmos device layers + added new pipe subtypes 2017-06-16 15:25:38 -05:00
CitadelStationBot
9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
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