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

2800 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
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06: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
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
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
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
Jordan Brown
95354a388f Vending TGUI 2017-12-24 15:03:38 -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
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
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
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
LetterJay
abced738bd Revert "[MIRROR] Db schema version check by simplification" 2017-12-21 09:52:42 -06:00
LetterJay
f29a3f89d0 Merge pull request #4421 from Citadel-Station-13/upstream-merge-33591 
[MIRROR] fixes magic mirrors letting you be robustin zombies
 2017-12-21 05:01:50 -06:00
LetterJay
57646f2e08 Merge pull request #4412 from Citadel-Station-13/upstream-merge-33549 
[MIRROR] Removes the visible messages from crossing vitality matrices
 2017-12-21 05:01:32 -06:00
LetterJay
e4fe687bd5 Merge pull request #4404 from Citadel-Station-13/upstream-merge-33582 
[MIRROR] Db schema version check by simplification
 2017-12-21 05:00:51 -06:00
LetterJay
3156382d2e Merge pull request #4470 from Citadel-Station-13/upstream-merge-33700 
[MIRROR] Fixes some syndicate duffelbags missing inhands
 2017-12-21 04:58:46 -06:00
LetterJay
e4d2234537 Merge pull request #4481 from Citadel-Station-13/upstream-merge-33706 
[MIRROR] Fixes some mecha code.
 2017-12-21 04:58:33 -06:00
LetterJay
97f427b5ee Merge pull request #4475 from Citadel-Station-13/upstream-merge-33689 
[MIRROR] Fix pulling things across space transitions
 2017-12-21 04:56:35 -06:00
LetterJay
86fed404b1 Update weldingtool.dm 2017-12-21 04:36:01 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
Jordan Brown
14942fb582 Merge pull request #33706 from AnturK/dumbmechacode 
Fixes some mecha code.
 2017-12-21 01:37:53 -06:00
Tad Hardesty
30fb3f8f5c Fix pulling things across space transitions (#33689) 2017-12-21 00:33:52 -06:00
deathride58
4d08f9b0bc Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635 
[MIRROR] Fixes captain's PDA showing the toggle remote door menu option
 2017-12-21 03:47:50 +00:00
deathride58
b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 
[MIRROR] [Ready]Brain Trauma additions
 2017-12-21 03:42:38 +00:00
deathride58
cf80b8a573 Merge pull request #4453 from Citadel-Station-13/upstream-merge-33651 
[MIRROR] Changelings learn languages from people they absorb
 2017-12-21 03:30:22 +00:00
deathride58
17dda62a93 Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622 
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-21 03:28:14 +00:00
deathride58
58f5069180 Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664 
[MIRROR] Halve gun empty sound level
 2017-12-21 03:27:50 +00:00
deathride58
811cd917aa Merge pull request #4457 from Citadel-Station-13/upstream-merge-33683 
[MIRROR] Fixes get admin command
 2017-12-21 03:27:32 +00:00
deathride58
2de3b12364 Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594 
[MIRROR] Adds knock off component
 2017-12-21 03:25:41 +00:00
QualityVan
5869eae8e9 Fixes some syndicate duffelbags missing inhands 2017-12-20 19:54:56 -06:00
LetterJay
84f51a8cbb antag team 2017-12-20 13:24:06 -06:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Jordan Brown
25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
Jordan Brown
b305f1bb26 Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears 
Halve gun empty sound level
 2017-12-20 00:14:28 -06:00