shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,778 Commits 5 Branches 0 Tags
134201d185d4f18fa66fffca1c8a786fe99dfd7e
Commit Graph

7219 Commits

Author SHA1 Message Date
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
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
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
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
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
Jordan Brown
af1f13e114 Merge pull request #33306 from coiax/replace-clean-flag-with-component 
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-23 08:36:37 -06:00
Jordan Brown
7bcf4d466a Merge pull request #33784 from octareenroon91/patch-56 
Fix file path to aimalf.ogg
 2017-12-23 08:31:23 -06:00
Jordan Brown
2a80a2d6fb Merge pull request #33728 from kevinz000/patch-408 
Fixes biodegrading handcuffs
 2017-12-23 08:27:09 -06:00
Robustin
17267781b5 Reworked EMP doorshocking (#33741) 2017-12-23 03:18:32 -06:00
Robustin
bede61c0ee Fixed empty HUD_List breaking alternate_appearances (#33742) 
* Alt Appearance works on empty HUD lists

* Fixes empty list runtime
 2017-12-23 01:46:50 -06:00
Jordan Brown
937fc2421c Add a single whitespace (#33746) 2017-12-23 01:43:37 -06:00
Dax Dupont
e0118067ec 2 borg metal fixes for the price of one (#33738) 2017-12-22 18:51:35 -06:00
coiax
f40d74e52f Gibber rebalance (#33737) 
🆑 coiax
balance: The kitchen gibber must be anchored in order to use.
balance: The gibber requires bodies to have no external items or
equipment.
/🆑

Unanchoring the gibber, running around with it, ebowing people, then
shoving them in is not fun.

As a double check, you REALLY should be stripping them of all that
cloth, it'll jam up the gears.

- Removes the abiotic() proc, it's literally used only in the gibber.
 2017-12-22 18:03:38 -06:00
CitadelStationBot
938f409782 [MIRROR] Christmas (#4491) 
* Christmas (#33690)

* Christmas Event Updates

* Dont recreate the list every time

* Check for drop del

* Changes some things to placate that one guy from FTL

* Christmas
 2017-12-22 13:14:25 -08:00
CitadelStationBot
6856fc1be2 [MIRROR] [s] Fixes the frying oil reagent (#4504) 
* Merge pull request #33745 from vuonojenmustaturska/oilfix

[s] Fixes the frying oil reagent

* [s] Fixes the frying oil reagent
 2017-12-22 12:32:56 -08:00
Jordan Brown
f20622cc54 Adds round ID to Show Server Revision (#33723) 2017-12-22 10:43:37 -06:00
kevinz000
454c073d22 Fixes message spam when proccalls are delayed due to another admin's proccalls running (#33732) 
* Fixes proccall block message spam

* One thread
 2017-12-22 10:40:25 -06:00
Armhulen
716e4da53e cool beans, partner (#33713) 2017-12-22 10:39:14 -06:00
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
oranges
a89435ac33 Merge pull request #32433 from kevinz000/vector_projectiles 
[READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-21 19:33:42 -06:00
oranges
4e8898d55f Merge pull request #33714 from lzimann/icon 
Job landmarks now show the mob with the proper job outfit.
 2017-12-21 19:27:23 -06:00
deathride58
baedc87c0a Merge pull request #4488 from Citadel-Station-13/upstream-merge-33606 
[MIRROR] Everyone gains antag HUD at round end
 2017-12-21 21:37:33 +00:00
Jordan Brown
b188266478 Merge pull request #33709 from uraniummeltdown/linespacing 
Adjustable Chat Line Height
 2017-12-21 14:25:21 -06:00
Jordan Brown
3f78bdcf59 Merge pull request #33606 from coiax/antaghud-on-end 
Everyone gains antag HUD at round end
 2017-12-21 14:24:49 -06:00