shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,845 Commits 5 Branches 0 Tags
6411e25110f0dca1fd63f022a8c2d9972439bbe3
Commit Graph
274 Commits
Author SHA1 Message Date
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
KorPhaeronandCitadelStationBot bdae94f60c Shooting walls can create bullet holes/dents (#30714) 
* Bullet holes in walls

* Code standards, new sprite
 2017-09-28 21:48:27 -05:00
LetterJayandGitHub 7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888 
[MIRROR] Refactors cinematics.
 2017-09-27 23:42:35 -04:00
LetterJayandGitHub 18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893 
[MIRROR] Datum abductors refactor
 2017-09-27 16:31:53 -04:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
AnturKandCitadelStationBot fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
Jordan BrownandCitadelStationBot 0a43bddaa1 Merge pull request #30863 from pubby/bluepipe 
Bluespace pipes
 2017-09-25 12:28:14 -05:00
pubbyandCitadelStationBot 34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
CitadelStationBotandPoojawa 8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
CitadelStationBotandPoojawa d0274da310 [MIRROR] Click signals (#2903) 
* Merge pull request #30924 from ninjanomnom/click-signals

Click signals

* Click signals
 2017-09-22 18:59:17 -05:00
Poojawa 573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
LetterJayandGitHub 54bd982d6b Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681 
[MIRROR] Prevents the creation of Shadowzombiechangelings
 2017-09-22 08:43:37 -04:00
PoojawaandGitHub aec48daa0a Ashdrake noms (#2868) 
* Initial commit

* probably a better way to check this

* It compiled boys. Let's see if it works.

* IT WAS ALL NULLS, BOYS

* Hooray, it's not broken anymore boys!

* Well it works, but we need transfer IDs to work

locating them post-initialize would help, probably. Then assigning their
links soon after.

* Bellies linked, autotransfer, LoseTarget

* half-thought sanity check needs to go away

* A few last minute tweaks.
 2017-09-21 06:29:08 -05:00
LetterJayandGitHub 79d769532f Update DNA.dm 2017-09-19 11:18:22 -05:00
CitadelStationBotandPoojawa ecce4cf138 [MIRROR] New DCS signals (#2741) 
* New DCS signals

* Update atoms.dm

* actually ports comsigs
 2017-09-19 07:00:08 -05:00
LetterJayandGitHub 19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344 
[MIRROR] Traitorbro gamemode
 2017-09-18 08:35:00 -04:00
PoojawaandGitHub d5c012d431 Update role_preferences.dm 2017-09-17 22:38:03 -05:00
PoojawaandGitHub a4310ec6a6 Update atom_hud.dm 2017-09-17 22:37:44 -05:00
CitadelStationBotandPoojawa d0c9f79a37 [MIRROR] Makes building with plasma glass a thing. (#2820) 
* Makes building with plasma glass a thing. (#30800)

* Makes building with plasma glass a thing.

* Updated grille.dm

* Makes building with plasma glass a thing.
 2017-09-17 22:22:50 -05:00
pubbyandCitadelStationBot a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
CitadelStationBotandPoojawa 08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796) 
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
 2017-09-17 11:59:40 -05:00
KorPhaeronandCitadelStationBot d104c1d76c Prevents the creation of Shadowzombiechangelings 2017-09-15 03:08:07 -05:00
CitadelStationBotandPoojawa 82861d208b [MIRROR] Fixes lighting hard deleting (#2760) 
* Fixes lighting hard deleting (#30684)

* Fixes lighting hard deleting
 2017-09-14 06:44:17 -05:00
CitadelStationBotandPoojawa 9031a1b671 [MIRROR] Soft crit slowdown for all carbons (#2743) 
* Soft crit slowdown for all carbons

* Update carbon_movement.dm

* Update carbon_movement.dm

* Update species.dm

* actually pay attention to spacings
 2017-09-13 21:29:50 -05:00
LetterJayandGitHub 1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJayandGitHub a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
Kyle Spier-SwensonandCitadelStationBot 3da71799ab Garbage collection tweaks and refactors. (#30118) 
* Garbage collection queuing rewriting

* Some Tweaks

* Fixes some queue tracking oddities

* More tweaks

* Remove the middle two queue steps. tis was a silly idea

* New logging.

We store logging datums for use in tracking the stats of shit qdeleted

Added logging for destroy time as well as hard delete time, per type. As well as a few others

* Fix compile for testing

* Does the cyberboss

* does the antur
 2017-09-13 01:47:12 -05:00
LetterJayandGitHub cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJayandGitHub c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
orangesandCitadelStationBot f2adac2a9a Merge pull request #30631 from AnturK/literallyfasterthanlight 
Fixes shuttle lighting issues
 2017-09-12 17:10:42 -05:00
LetterJayandGitHub caca1d1794 Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553 
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
 2017-09-12 01:22:11 -05:00
LetterJayandGitHub f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
LetterJayandGitHub 16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJayandGitHub 935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
LetterJayandGitHub 914cc38a2d Merge pull request #2676 from Citadel-Station-13/upstream-merge-30515 
[MIRROR] Added warnings for ultrasafe and safe security modes
 2017-09-11 17:54:18 -05:00
KorPhaeronandCitadelStationBot 4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJayandGitHub 01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
LetterJayandGitHub 7cdd5eaa02 Update admin.dm 2017-09-11 14:22:23 -05:00
LetterJayandGitHub 24dd22aff5 Update components.dm 2017-09-11 14:10:27 -05:00
LetterJayandGitHub 74a163db23 Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252 
[MIRROR] Server tools versioning and fix to displayed testmerges
 2017-09-11 13:12:10 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
Jordan BrownandCitadelStationBot eaeaae7bef Added warnings for ultrasafe and safe security modes (#30515) 2017-09-09 19:39:52 -05:00
Jordan BrownandCitadelStationBot 92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot 33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
JJRcopandCitadelStationBot 00dd2f283b Adds Internet admin midi (#30457) 
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
 2017-09-08 09:32:29 -05:00
LetterJayandGitHub 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00