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

789 Commits

Author SHA1 Message Date
CitadelStationBot
aa45f555e3 Makes the cult Talisman of Horrors ranged 2017-05-02 04:57:29 -05:00
LetterJay
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJay
7ab8ee8cae Merge pull request #581 from Citadel-Station-13/upstream-merge-26524 
[MIRROR] Admin proc calls are now serialized per admin
 2017-05-02 04:51:43 -05:00
LetterJay
d3850bde68 Merge pull request #691 from Citadel-Station-13/upstream-merge-26740 
[MIRROR] Port SM shards to initialize
 2017-05-02 03:04:54 -05:00
LetterJay
9036e8c63a Merge pull request #690 from Citadel-Station-13/upstream-merge-26739 
[MIRROR] You can no longer queue up ahelps by queing up prompts
 2017-05-02 03:04:37 -05:00
LetterJay
e4bb3ebfb7 Merge pull request #689 from Citadel-Station-13/upstream-merge-25603 
[MIRROR] Gaining Vanguard will remove existing stuns
 2017-05-02 03:04:25 -05:00
LetterJay
7d697b153b Merge pull request #686 from Citadel-Station-13/upstream-merge-26737 
[MIRROR] Makes surplus crates less likely to contain implants
 2017-05-02 03:04:09 -05:00
LetterJay
a6263621e7 Merge pull request #688 from Citadel-Station-13/upstream-merge-26729 
[MIRROR] Gang Pen Is now Stealthy
 2017-05-02 03:03:43 -05:00
CitadelStationBot
fa888cc521 Fixes drakes continuing to swoop when killed (#713) 2017-05-02 02:49:41 -05:00
LetterJay
64fd72f1cf Update artefact.dm 2017-05-01 15:31:51 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
161891e51b conflict res 2017-05-01 15:26:17 -05:00
CitadelStationBot
185e077f33 Port SM shards to initialize 2017-05-01 11:38:08 -05:00
CitadelStationBot
34a701a1bc You can no longer queue up ahelps by queing up prompts 2017-05-01 11:38:04 -05:00
CitadelStationBot
1426a20834 Gaining Vanguard will remove existing stuns 2017-05-01 11:07:33 -05:00
CitadelStationBot
242cc65eac Gang Pen Is now Stealthy 2017-05-01 11:05:28 -05:00
CitadelStationBot
99754380b5 Makes surplus crates less likely to contain implants 2017-05-01 08:39:14 -05:00
LetterJay
1842665af6 idjeet 2017-05-01 08:38:03 -05:00
LetterJay
a3eec6c8f9 Merge pull request #670 from Citadel-Station-13/upstream-merge-26713 
[MIRROR] [s] SDQL security patches
 2017-05-01 08:11:36 -05:00
LetterJay
31ea9cb309 Merge pull request #657 from Citadel-Station-13/upstream-merge-26689 
[MIRROR] [s] Patches SDQL exploits that can return world reference
 2017-05-01 08:11:22 -05:00
LetterJay
d7624b5824 Merge pull request #678 from Citadel-Station-13/upstream-merge-26663 
[MIRROR] Buffs jump boot dash speed
 2017-05-01 08:10:23 -05:00
LetterJay
3d6845675a Merge pull request #679 from Citadel-Station-13/upstream-merge-26709 
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
 2017-05-01 08:10:13 -05:00
LetterJay
3c786aa8c0 Merge pull request #681 from Citadel-Station-13/upstream-merge-26719 
[MIRROR] Fixes some null.add_reagents runtimes
 2017-05-01 08:09:55 -05:00
LetterJay
7261d61983 Merge pull request #672 from Citadel-Station-13/upstream-merge-26717 
[MIRROR] Moves antag datums to the mind
 2017-05-01 08:09:22 -05:00
LetterJay
03efaf3f13 Merge pull request #673 from Citadel-Station-13/upstream-merge-26718 
[MIRROR] Winter Wonderland holodeck no longer has freon, and it's no longer restricted
 2017-05-01 08:09:07 -05:00
LetterJay
6102c25410 Merge pull request #669 from Citadel-Station-13/upstream-merge-26680 
[MIRROR] Mob directory
 2017-05-01 08:06:52 -05:00
LetterJay
be766d9539 Merge pull request #668 from Citadel-Station-13/upstream-merge-26691 
[MIRROR] Fixes changelings being unable to revive from death without a brain
 2017-05-01 08:04:21 -05:00
LetterJay
9b8ddc57b3 Merge pull request #667 from Citadel-Station-13/upstream-merge-26694 
[MIRROR] Fixes seeing the you are a brain! message during monkey transformation
 2017-05-01 08:04:10 -05:00
LetterJay
03bae077e9 Merge pull request #666 from Citadel-Station-13/upstream-merge-26706 
[MIRROR] Removes Rest from Voice of God
 2017-05-01 08:03:50 -05:00
LetterJay
b016af2d63 Merge pull request #665 from Citadel-Station-13/upstream-merge-26712 
[MIRROR] Fixes emitter sparks
 2017-05-01 08:03:19 -05:00
LetterJay
442fef549e Merge pull request #664 from Citadel-Station-13/upstream-merge-26698 
[MIRROR] Message monitor fix + spawn kill
 2017-05-01 08:02:54 -05:00
LetterJay
dd904e3640 Merge pull request #663 from Citadel-Station-13/upstream-merge-26736 
[MIRROR] >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
 2017-05-01 08:02:44 -05:00
LetterJay
73c1a83d62 Merge pull request #660 from Citadel-Station-13/upstream-merge-26692 
[MIRROR] Fixes debraining messages showing up one place they shouldn't
 2017-05-01 08:01:55 -05:00
LetterJay
86ea3efeef Merge pull request #659 from Citadel-Station-13/upstream-merge-26687 
[MIRROR] Moves config/names to strings/names
 2017-05-01 08:01:41 -05:00
LetterJay
647a9967ba Merge pull request #656 from Citadel-Station-13/upstream-merge-26538 
[MIRROR] Bank Machine now uses the radio rather than announcements
 2017-05-01 08:00:41 -05:00
LetterJay
c93c5bf50f Merge pull request #655 from Citadel-Station-13/upstream-merge-26693 
[MIRROR] Prevents GODMODE mobs from dying to organ removal
 2017-05-01 08:00:07 -05:00
LetterJay
061e49d651 Merge pull request #654 from Citadel-Station-13/upstream-merge-26662 
[MIRROR] Status effects are actually deleted/handled when the mob is deleted
 2017-05-01 07:59:55 -05:00
LetterJay
d46b85e9ed Merge pull request #653 from Citadel-Station-13/upstream-merge-26676 
[MIRROR] Fix SDQL vars again
 2017-05-01 07:59:42 -05:00
LetterJay
3955c7da7d Merge pull request #651 from Citadel-Station-13/upstream-merge-26681 
[MIRROR] You can no longer spam-spawn scarabs via Ratvar
 2017-05-01 07:59:16 -05:00
LetterJay
7c02c0ef6a Merge pull request #649 from Citadel-Station-13/upstream-merge-26678 
[MIRROR] Ports chem grenades to Initialize
 2017-05-01 07:58:20 -05:00
LetterJay
817b259192 Merge pull request #648 from kevinz000/patch-2 
Gives help intent groin functionality to wicker dolls
 2017-05-01 07:58:09 -05:00
LetterJay
b2c1ff2bc2 Merge pull request #647 from Citadel-Station-13/upstream-merge-26398 
[MIRROR] Old ore processor cleanup
 2017-05-01 07:57:38 -05:00
LetterJay
e9dc5bcd95 Merge pull request #643 from Citadel-Station-13/upstream-merge-26643 
[MIRROR] Makes dance machine GBP requirements track-based instead of hardcoded
 2017-05-01 07:56:37 -05:00
LetterJay
954b035868 Merge pull request #644 from Citadel-Station-13/upstream-merge-26651 
[MIRROR] Replaces Double Agents with Internal Affairs
 2017-05-01 07:56:17 -05:00
LetterJay
1a5ab1d5be Merge pull request #639 from Citadel-Station-13/upstream-merge-26633 
[MIRROR] Adds death checks to two hallucinations, preventing the dead from spasming
 2017-05-01 07:44:25 -05:00
LetterJay
5cab328632 Merge pull request #638 from Citadel-Station-13/upstream-merge-26536 
[MIRROR] Nerfs and buffs The Traps
 2017-05-01 07:44:15 -05:00
LetterJay
bd2b4207e2 Merge pull request #637 from Citadel-Station-13/upstream-merge-26204 
[MIRROR] Option for admins to show a song's title
 2017-05-01 07:43:59 -05:00
LetterJay
f2af0cac91 Merge pull request #635 from Citadel-Station-13/upstream-merge-26602 
[MIRROR] Makes it less painful to add songs to the disco machine
 2017-05-01 07:43:27 -05:00
LetterJay
c2b2b8c2a3 Merge pull request #634 from Citadel-Station-13/upstream-merge-26597 
[MIRROR] Tank suicide no longer gibs w/o enough pressure
 2017-05-01 07:43:17 -05:00
LetterJay
8adddd5916 Merge pull request #633 from Citadel-Station-13/upstream-merge-26626 
[MIRROR] Syndie Lavaland Base Flavortext Edit
 2017-05-01 07:43:01 -05:00