shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,777 Commits 5 Branches 0 Tags
6df769de4663a8d3889af4dc693fc6d116a108ae
Commit Graph

7801 Commits

Author SHA1 Message Date
deathride58
6df769de46 Merge pull request #4807 from Citadel-Station-13/upstream-merge-34358 
[MIRROR] Cleans up a nesting level in pet attackby
 2018-01-13 20:27:12 +00:00
deathride58
412e43674c Merge pull request #4806 from Citadel-Station-13/upstream-merge-34342 
[MIRROR] for var i in 1 to dildos
 2018-01-13 20:26:49 +00:00
deathride58
3da566f86b Merge pull request #4805 from Citadel-Station-13/upstream-merge-34346 
[MIRROR] Fix slot machine design icon
 2018-01-13 20:26:28 +00:00
deathride58
7d5c3897e3 Merge pull request #4802 from Citadel-Station-13/upstream-merge-34350 
[MIRROR] Grammarize the internals screen object
 2018-01-13 20:25:29 +00:00
deathride58
9742597382 Merge pull request #4801 from Citadel-Station-13/upstream-merge-34343 
[MIRROR] Penguins are immune to cold
 2018-01-13 20:25:01 +00:00
deathride58
7ec007d204 Merge pull request #4800 from Citadel-Station-13/upstream-merge-34352 
[MIRROR] Remove unnused random event
 2018-01-13 20:24:42 +00:00
deathride58
0cad3946c3 Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161 
[MIRROR] Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 20:24:13 +00:00
deathride58
b586ec55a7 Merge pull request #4798 from Citadel-Station-13/upstream-merge-33958 
[MIRROR] Dreaming Improvements
 2018-01-13 20:23:03 +00:00
deathride58
9c19710b72 Merge pull request #4797 from Citadel-Station-13/upstream-merge-34155 
[MIRROR] Allows admins to select an outfit while transforming a mob to human via rudimentary transform
 2018-01-13 20:22:23 +00:00
deathride58
90b35d405a Merge pull request #4796 from Citadel-Station-13/upstream-merge-33699 
[MIRROR] Makes vault safe slightly less explosion-proof
 2018-01-13 20:22:05 +00:00
deathride58
9ccd21605d Merge pull request #4795 from Citadel-Station-13/pbchange 
Panic bunker notice change
 2018-01-13 20:21:43 +00:00
deathride58
e9785d8512 Merge pull request #4794 from Citadel-Station-13/upstream-merge-34296 
[MIRROR] Fixes stimulum running out before the next breath
 2018-01-13 20:21:21 +00:00
deathride58
80c4d1d92e Merge pull request #4793 from Citadel-Station-13/upstream-merge-34313 
[MIRROR] Fix airlock console HTML
 2018-01-13 20:21:03 +00:00
deathride58
9c28302717 Merge pull request #4792 from Citadel-Station-13/upstream-merge-34316 
[MIRROR] Fixes poker tables not being deleted after Narsie touches them
 2018-01-13 20:20:43 +00:00
Leo
665856c152 Merge pull request #34358 from ShizCalev/nest-pet-collar 
Cleans up a nesting level in pet attackby
 2018-01-13 08:58:37 -06:00
Iamgoofball
a87a6dafda for var i in 1 to dildos 
My fellow brothers, I, Billy Herrington, stand here today, humbled by the task before us, mindful of the sacrifices borne by our Nico Nico ancestors.

We are in the midst of a crisis. Nico Nico Douga is at war against a far-reaching storm of disturbance and deletion. Nico Nico's economy is badly weakened: a consequence of carelessness and irresponsibility on the part of acknowledgement, but also on the collective failure to make hard choices and to prepare for a new, MAD age.

Today, I say to you, that the challenges are real, and they are many. They will not be easily met, or in a short span of time, but know this, Nico Nico: they will be met. In reaffirming the greatness of our site, we understand that greatness is never given, our journey has never been one of shortcuts. It has not been for the faint-hearted, or who seek the fleshly pleasures. Rather, it has been the risk-takers, the wasted genii, the creators of MAD things. For us, they toiled in sweatshops, endured the lash of the spanking. Time and again, these men struggled, and sacrificed, so that we might ... LIVE BETTER.

We remain the most powerful site on the Internet, our minds no less inventive, and services no less needed than they were last week, or yesterday, or the day before the day after tomorrow. Starting today, we must pull up our pants, dust ourselves off, and begin again the work of remaking Nico Nico Douga.

Now, there are some who question the scale of our ambitions, who suggest our server system cannot tolerate too many movies. Their memories are short, for they have forgotten what Nico Nico already has done, what free men can achieve when imagination is joined to common purpose.

And so, to all the people who are watching this video, from the grandest cities, to the small villages where IKZO was born, know that Nico Nico is a friend to every man, who seeks the future of love and peace. Now we will begin to responsibly leave authorized common materials to Nico Nico people, and forge a hard-earned peace in this MAD world.

What is required of us now is a new era of responsibility. This is the price, and the promise, of Nico NiCommons citizenship. Nico Nico Douga, in the face of common dangers, in this winter of our hardship, let us remember these timeless words: ASS, WE CAN.

Let it be said by our children's children, that when we were tested by DOS attacks, when we were refused by YouTube, that we did not turn back, nor did we falter, and we carried forth that great gift of freedom be delivered, and safely to future generations.

Thank you. God bless, and God bless Nico Nico Douga.
 2018-01-13 08:54:23 -06:00
Leo
661ac975f1 Merge pull request #34346 from AutomaticFrenzy/patch/slot-machine-icon 
Fix slot machine design icon
 2018-01-13 05:59:17 -06:00
Tad Hardesty
06120d3174 Grammarize the internals screen object 2018-01-13 04:36:43 -06:00
Armhulen
8bb5288c58 zzzzzz 2018-01-13 04:32:30 -06:00
Leo
4ae8e504df Remove unnused random event 2018-01-13 04:31:21 -06:00
oranges
8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly 
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 04:23:03 -06:00
oranges
93f00d4a0f Merge pull request #33958 from XDTM/Morpheus 
Dreaming Improvements
 2018-01-13 04:21:50 -06:00
oranges
96f17eebb2 Merge pull request #34155 from deathride58/rudimentaryoutfitequip 
Allows admins to select an outfit while transforming a mob to human via rudimentary transform
 2018-01-13 04:18:38 -06:00
oranges
e164b0cf25 Merge pull request #33699 from QualityVan/safedestruction 
Makes vault safe slightly less explosion-proof
 2018-01-13 04:17:27 -06:00
LetterJay
6a9545db8a Panic bunker notice change 2018-01-12 23:22:36 -06:00
LetterJay
29287f84db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-01-12 20:05:58 -06:00
LetterJay
72a9030f6a donate fix 2018-01-12 20:05:50 -06:00
kevinz000
54b356a227 Fixes stimulum running out before the next breath (#34296) 2018-01-12 13:05:12 -06:00
Leo
9c17444c5f Merge pull request #34313 from AutomaticFrenzy/patch/airlock-controller 
Fix airlock console HTML
 2018-01-12 12:57:52 -06:00
Leo
1d729e7d6d Merge pull request #34316 from tgstation/Cyberboss-patch-4 
Fixes poker tables not being deleted after Narsie touches them
 2018-01-12 12:30:15 -06:00
deathride58
391fc06f01 Merge pull request #4789 from Citadel-Station-13/upstream-merge-34301 
[MIRROR] Harvesters now normally attack those with NODISMEMBER species
 2018-01-12 17:48:24 +00:00
deathride58
62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310 
[MIRROR] Removes some hrefs from logging
 2018-01-12 17:48:13 +00:00
deathride58
bbc1e0d386 Merge pull request #4787 from Citadel-Station-13/upstream-merge-34305 
[MIRROR] Add JMP buttons to mapping debug verbs
 2018-01-12 17:47:54 +00:00
deathride58
8fdfa44505 Merge pull request #4786 from Citadel-Station-13/upstream-merge-34312 
[MIRROR] Fix description of relabelled canisters
 2018-01-12 17:47:40 +00:00
deathride58
64c307800d Merge pull request #4785 from Citadel-Station-13/upstream-merge-34184 
[MIRROR] Fixes pet collars not updating icons, also fixes being unable to attach collars to most pets
 2018-01-12 17:47:07 +00:00
deathride58
f90a0e66e0 Merge pull request #4784 from Citadel-Station-13/upstream-merge-34174 
[MIRROR] Sigils of submission now uncuff upon successful conversion
 2018-01-12 17:46:46 +00:00
deathride58
0ec41c02d4 Merge pull request #4783 from Citadel-Station-13/upstream-merge-34259 
[MIRROR] Pointing will now properly reflect a lack of arms (and legs!)
 2018-01-12 17:46:29 +00:00
deathride58
63354404e4 Merge pull request #4782 from Citadel-Station-13/upstream-merge-34260 
[MIRROR] Adds an indestructible disco/dance machine for admemes and disco inferno shuttle
 2018-01-12 17:46:00 +00:00
deathride58
160955eef1 Merge pull request #4781 from Citadel-Station-13/upstream-merge-34274 
[MIRROR] Makes bot emagging more consistent
 2018-01-12 17:45:14 +00:00
deathride58
78c5e62ae7 Merge pull request #4780 from Citadel-Station-13/upstream-merge-34280 
[MIRROR] Fixes mobs on lavaland targeting through walls on wakeup
 2018-01-12 17:44:58 +00:00
deathride58
9b2406cf50 Merge pull request #4779 from Citadel-Station-13/upstream-merge-34287 
[MIRROR] Makes cyborg module damage visible to anyone nearby
 2018-01-12 17:44:27 +00:00
deathride58
40d2a8ed55 Merge pull request #4778 from Citadel-Station-13/upstream-merge-34288 
[MIRROR] Move a definition to the right file
 2018-01-12 17:43:55 +00:00
deathride58
661cf56031 Merge pull request #4777 from Citadel-Station-13/upstream-merge-34294 
[MIRROR] Add /datum prefix to custom root types
 2018-01-12 17:43:38 +00:00
deathride58
30bec7a1d0 Merge pull request #4775 from Citadel-Station-13/upstream-merge-34295 
[MIRROR] Fixes brass skewer grammar
 2018-01-12 17:42:56 +00:00
deathride58
8bfc56981b Merge pull request #4774 from Citadel-Station-13/upstream-merge-34297 
[MIRROR] Clockcult ark now teleports anything people are in to the station instead of just the person on destruction
 2018-01-12 17:42:39 +00:00
deathride58
a7ec44bfcc Merge pull request #4773 from Citadel-Station-13/upstream-merge-34298 
[MIRROR] Adds logging and feedback messages to organ manipulations by admins
 2018-01-12 17:42:24 +00:00
deathride58
ed3779feff Merge pull request #4772 from Citadel-Station-13/upstream-merge-34336 
[MIRROR] Fixes forensics runtimes
 2018-01-12 17:42:05 +00:00
deathride58
a2fb8b5304 Merge pull request #4765 from Citadel-Station-13/upstream-merge-34117 
[MIRROR] Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
 2018-01-12 17:41:44 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090 
[MIRROR] Replace hardcoded z-level numbers with a trait system
 2018-01-12 17:41:28 +00:00
Leo
429237d06c Merge pull request #34301 from kevinz000/patch-428 
Harvesters now normally attack those with NODISMEMBER species
 2018-01-12 07:05:49 -06:00