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

2825 Commits

Author SHA1 Message Date
Jordan Brown
dbab8bbdab Adds open/close sound to blastdoors and shutters 2017-12-27 10:50:17 -06:00
LetterJay
c84a8cc9e1 Merge pull request #4370 from Citadel-Station-13/upstream-merge-33504 
[MIRROR] Saves newscaster data and photos to round logs folder
 2017-12-27 04:46:04 -06:00
LetterJay
67ef791794 Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821 
[MIRROR] Fixes deleting handcuffs
 2017-12-27 03:05:33 -06:00
LetterJay
d33fe81662 Merge pull request #4536 from Citadel-Station-13/upstream-merge-33822 
[MIRROR] Cut through handcuffs with power wirecutters
 2017-12-27 03:05:21 -06:00
Jordan Brown
4499ff2fad Merge pull request #33834 from Xhuis/drone_hats 
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
 2017-12-26 18:38:42 -06:00
LetterJay
290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay
4cfb2e323b Merge branch 'master' into upstream-merge-33504 2017-12-26 06:08:12 -06:00
LetterJay
358c625ed3 Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590 
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
 2017-12-26 05:59:52 -06:00
LetterJay
e4f39a97c3 Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634 
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
 2017-12-26 05:29:42 -06:00
Matt Smith
7b159e204c Cut through handcuffs with power wirecutters (#33822) 
* Cut through handcuffs with power wirecutters

* unbuckle is handled on delete of the handcuffs
 2017-12-26 00:14:24 -06:00
ShizCalev
3ea4e84719 Fixes deleting handcuffs (#33821) 
* Fixes deleting handcuffs

* cleanup
 2017-12-26 00:13:13 -06:00
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
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
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
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
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
LetterJay
aec1142ca1 Update _eminence.dm 2017-12-24 02:38:37 -06:00
LetterJay
709d55bc4a Update pneumaticCannon.dm 2017-12-23 13:50:48 -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
AnturK
34b749d2ca Fixes eminence login 2017-12-23 08:14:44 -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
kevinz000
bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06: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
Ashe Higgs
c5485faee7 Tiles blessed by holy water now block servant warp-in/Eminence snooping (#33584) 
* Blessing tiles blocks servant warp

* Removes the color

* Prevents the message from showing on the same turf
 2017-12-21 06:37:06 -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