shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,992 Commits 5 Branches 0 Tags
c3fe3f674fcb24958ff35b2dbb6152a2d82b1128
Commit Graph

2175 Commits

Author SHA1 Message Date
CitadelStationBot
c3fe3f674f Fixes #28500 : Cryo cells properly compare to a mob's max health 2017-06-17 07:36:24 -05:00
LetterJay
f659a0923e Merge pull request #1621 from lm40/master 
Fixes medidoggo chemicals
 2017-06-16 11:11:06 -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
LetterJay
00d4843162 Merge pull request #1616 from Citadel-Station-13/upstream-merge-28465 
[MIRROR] Fixes a documentation typo
 2017-06-16 11:09:51 -05:00
LetterJay
f067120b63 Merge pull request #1615 from Citadel-Station-13/upstream-merge-28206 
[MIRROR] Examining an ore box you are adjacent to shows its contents.
 2017-06-16 11:09:29 -05:00
LetterJay
5933ad0d78 Merge pull request #1614 from Citadel-Station-13/upstream-merge-28477 
[MIRROR] Fixes Geis counting dead servants
 2017-06-16 11:09:08 -05:00
LetterJay
63ae7e2d58 Merge pull request #1612 from Citadel-Station-13/upstream-merge-28456 
[MIRROR] Knocked-over chairs have materials.
 2017-06-16 11:08:35 -05:00
lm40
2502baaaab quick reagent fix 2017-06-16 11:49:02 -04: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
ef336bb4ad Fixes a documentation typo 2017-06-15 20:48:37 -05:00
CitadelStationBot
db01827ede Examining an ore box you are adjacent to shows its contents. 2017-06-15 20:26:14 -05:00
CitadelStationBot
3b5d55260a Fixes Geis counting dead servants 2017-06-15 19:55:41 -05:00
CitadelStationBot
c97658e39a Knocked-over chairs have materials. 2017-06-15 19:48:25 -05:00
CitadelStationBot
ddee871df7 Good boy Robustin does a heckin inducer fix 2017-06-15 19:04:35 -05:00
LetterJay
f0f6341588 Create verbs.dm 2017-06-15 10:06:05 -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
5b753a5180 Does it still slap those goddamn item pictures on every hit? How do I make it not to! Blagh. 2017-06-15 00:05:22 +03:00
Verkister
4bab1168d9 :^↕ 2017-06-14 23:53:13 +03:00
Verkister
bac4cebfe8 removed a twig fro mthe gearbox. 2017-06-14 23:43:21 +03:00
Verkister
e24faba491 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.

(apparently had some older junk edits that tried to cram into the pr)
 2017-06-14 23:18:44 +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
d6d1a26376 Create ghost_role_spawners.dm 2017-06-14 14:28:57 -05:00
LetterJay
df629847bc Create ghost_role_spawners.dm 2017-06-14 13:19:00 -05: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
b602462cbb Create portable_turret.dm 2017-06-14 12:05:31 -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
Verkister
da6cd22d13 Merge branch 'master' of https://github.com/Verkister/Citadel-Station-13 2017-06-14 17:38:56 +03: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
aba07154d0 Delete ghost_role_spawners.dm.rej 2017-06-14 08:27:11 -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
0f966610de Update ghost_role_spawners.dm 2017-06-14 08:25:09 -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