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

8366 Commits

Author SHA1 Message Date
LetterJay
50672ecf93 Merge pull request #4512 from Citadel-Station-13/upstream-merge-33752 
[MIRROR] Fixes eminence login
 2017-12-25 21:29:21 -06:00
LetterJay
5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
LetterJay
91e87bf801 Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584 
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
 2017-12-25 21:27:17 -06:00
LetterJay
374ab40f4a Merge pull request #4497 from Citadel-Station-13/upstream-merge-33731 
[MIRROR] Tweaks the syndicate infiltrator so it's no longer lopsided.
 2017-12-25 21:26:34 -06:00
LetterJay
134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433 
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-25 21:26:17 -06:00
Emmett Gaines
0a29f02c89 Blocks auxiliary bases from being placed on top of lava or indestructible turfs 2017-12-25 19:18:01 -06:00
Emmett Gaines
9ece43116d Makes cyclelinkeddir rotate with shuttle 2017-12-25 19:16:47 -06:00
Cruix
8465defbb0 Modified the starting locations of advanced camera console eyes (#33759) 
* Modified the starting locations of advanced camera console eyes
Made shuttle navigation computers no longer work on z levels they are not locked to

* Advanced camera eyes do not start on the console if they use static and the console is in camera view but not on a usable z-level
 2017-12-25 19:14:33 -06:00
Emmett Gaines
a1ec5538a6 Arena shuttle teleport fix (#33777) 2017-12-25 19:12:20 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
Jordan Brown
08b2224007 Adds random seed feedback (#33708) 
* Master now sets rand_seed

* Blackbox now records Master.random_seed
 2017-12-25 19:05:36 -06:00
coiax
703667bdff Ghosts can *spin and *flip 2017-12-25 17:11:29 -06:00
kevinz000
b0f793f435 gives medical some medical boards, but not their own circuit imprinter yet (#33816) 
* medical gets med boards

* sleepers/cryo too
 2017-12-25 16:42:18 -06:00
LetterJay
6205268f7e Merge pull request #4441 from Citadel-Station-13/upstream-merge-33661 
[MIRROR] [HIGH PRIORITY]Hotfix for the monkeylike disability
 2017-12-25 07:28:52 -06:00
LetterJay
62a9649a98 Update disease_outbreak.dm 2017-12-25 05:23:37 -06:00
LetterJay
7b40f3f0e0 Update disease_outbreak.dm 2017-12-25 05:09:21 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
kevinz000
cab61abc32 Update autolathe_designs.dm 2017-12-24 23:29:33 -08:00
kevinz000
30bc560972 readds shock collars 2017-12-24 21:48:06 -08:00
LetterJay
3966774d09 Merge pull request #4440 from Citadel-Station-13/upstream-merge-33655 
[MIRROR] Non movement keys pressed while moving no longer stop movement
 2017-12-24 22:10:15 -06:00
LetterJay
8f6960e1a3 Merge pull request #4522 from Citadel-Station-13/upstream-merge-33579 
[MIRROR] [READY]Circuitry upgrades
 2017-12-24 22:09:42 -06:00
deathride58
d8e25d9501 Merge pull request #4499 from Citadel-Station-13/upstream-merge-33713 
[MIRROR] if the deflection chance is < 100%, it won't say they can never be hit by ranged weapons
 2017-12-24 23:06:28 +00:00
deathride58
9ce056322a Merge pull request #4493 from Citadel-Station-13/upstream-merge-33714 
[MIRROR] Job landmarks now show the mob with the proper job outfit.
 2017-12-24 23:05:36 +00:00
deathride58
6dc2d8f0eb Update reagents.dm 2017-12-24 18:02:13 -05:00
LetterJay
99b88b4c4d Merge pull request #4521 from Citadel-Station-13/upstream-merge-33739 
[MIRROR] Vending TGUI
 2017-12-24 17:01:04 -06:00
LetterJay
a81e2aa31b Merge pull request #4519 from Citadel-Station-13/upstream-merge-33789 
[MIRROR] Fixes soapstone time.
 2017-12-24 17:00:51 -06:00
LetterJay
c99d847163 Merge pull request #4518 from Citadel-Station-13/upstream-merge-33765 
[MIRROR] Make airlocks use VARSET_CALLBACK
 2017-12-24 17:00:41 -06:00
LetterJay
06354b97d9 Merge pull request #4517 from Citadel-Station-13/upstream-merge-33792 
[MIRROR] gbs now grants a sense of pride and accomplishment instead of 40 hours of toxin damage.
 2017-12-24 17:00:30 -06:00
LetterJay
fff9f49738 Merge pull request #4516 from Citadel-Station-13/upstream-merge-33801 
[MIRROR] Fix download objective always greentexting
 2017-12-24 17:00:18 -06:00
LetterJay
0f86dd3f72 Merge pull request #4515 from Citadel-Station-13/upstream-merge-33306 
[MIRROR] Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-24 17:00:06 -06:00
LetterJay
144737d97d Merge pull request #4514 from Citadel-Station-13/upstream-merge-33784 
[MIRROR] Fix file path to aimalf.ogg
 2017-12-24 16:57:07 -06:00
LetterJay
2001ba6a8e Merge pull request #4513 from Citadel-Station-13/upstream-merge-33728 
[MIRROR] Fixes biodegrading handcuffs
 2017-12-24 16:54:15 -06:00
LetterJay
e7f926c153 Update _eminence.dm 2017-12-24 16:54:01 -06:00
LetterJay
68c5059701 Merge pull request #4509 from Citadel-Station-13/upstream-merge-33741 
[MIRROR] Refactored EMP doorshock chances
 2017-12-24 16:53:15 -06:00
LetterJay
180beaace8 Merge pull request #4508 from Citadel-Station-13/upstream-merge-33742 
[MIRROR] Fixed empty HUD_List breaking alternate_appearances
 2017-12-24 16:53:00 -06:00
LetterJay
7b1cc09080 Merge pull request #4507 from Citadel-Station-13/upstream-merge-33746 
[MIRROR] Christmas changelog
 2017-12-24 16:52:46 -06:00
LetterJay
0c5620233e Merge pull request #4506 from Citadel-Station-13/upstream-merge-33738 
[MIRROR] 2 borg metal fixes for the price of one
 2017-12-24 16:52:33 -06:00
LetterJay
244b68b17b Merge pull request #4505 from Citadel-Station-13/upstream-merge-33737 
[MIRROR] Gibber rebalance
 2017-12-24 16:52:14 -06:00
LetterJay
e43ab5686f Merge pull request #4501 from Citadel-Station-13/upstream-merge-33723 
[MIRROR] Adds round ID to Show Server Revision
 2017-12-24 16:51:45 -06:00
LetterJay
258910c731 Merge pull request #4500 from Citadel-Station-13/upstream-merge-33732 
[MIRROR] Fixes message spam when proccalls are delayed due to another admin's proccalls running
 2017-12-24 16:51:35 -06:00
arsserpentarium
a893559c6b [READY]Circuitry upgrades 2017-12-24 15:03:45 -06:00
Jordan Brown
95354a388f Vending TGUI 2017-12-24 15:03:38 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
FrozenGuy5
0068bb2ed2 adds world.realtime to soapstone 2017-12-24 15:03:22 -06:00
Jordan Brown
d1d8687a63 Merge pull request #33765 from MoreRobustThanYou/patch-33 
Make airlocks use VARSET_CALLBACK
 2017-12-24 15:03:15 -06:00
Armhulen
d9f3c74607 pride and satisfaction 2017-12-24 15:03:07 -06:00
Jordan Brown
a111679821 Merge pull request #33801 from AutomaticFrenzy/patch/download 
Fix download objective always greentexting
 2017-12-24 15:02:57 -06:00
LetterJay
e2ba458400 Update roundend.dm 2017-12-24 02:40:05 -06:00
LetterJay
d6c1c7ecc9 Merge branch 'master' into upstream-merge-33634 2017-12-24 02:39:35 -06:00
LetterJay
b0671ed78a Update eminence_spire.dm 2017-12-24 02:38:47 -06:00