Commit Graph

1612 Commits

Author SHA1 Message Date
deathride58
2b859638e9 Merge pull request #4836 from Citadel-Station-13/upstream-merge-34396
[MIRROR] Fixed alt-click not working with stacks
2018-01-15 06:17:51 +00:00
John Ginnane
ac1b2f76ef Fixed alt-click not working with stacks (#34396)
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
2018-01-14 22:05:07 -06:00
Tlaltecuhtli
37fa7830ec Fixes eating mouse grammar (#34395) 2018-01-14 22:01:31 -06:00
Tlaltecuhtli
ac14a5b4e8 sfds (#34392) 2018-01-14 15:42:06 -06:00
deathride58
c3ce0d8f28 Merge pull request #4821 from Citadel-Station-13/wagfix2018
Fixes *wag for mammals
2018-01-14 21:12:01 +00:00
Poojawa
e385ab090e Fixes message visibility for vorish play
It's the little things I have to prune.
2018-01-14 12:01:24 -06:00
Poojawa
655067471a Fixes *wag for mammals
Someone forgot that we have snowflake bodyparts.
2018-01-14 03:50:26 -06:00
deathride58
87b614aaf9 Merge pull request #4817 from Citadel-Station-13/upstream-merge-34338
[MIRROR] Replaces cached get_area vars to grab area names with get_area_name()
2018-01-14 04:01:33 +00:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
AnturK
50529187d6 Fixes mecha pilot speed. 2018-01-13 14:51:10 -06:00
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
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
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
Armhulen
8bb5288c58 zzzzzz 2018-01-13 04:32:30 -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
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
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
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
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
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
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
ShizCalev
8bd1f07353 Fixes pet collars not updating icons (#34184) 2018-01-12 06:17:04 -06:00
ExcessiveUseOfCobblestone
8af2ee0fdd Pointing will now properly reflect a lack of arms (and legs!) (#34259)
* Update emote.dm

* Update emote.dm

* Update emote.dm

* toot
2018-01-11 21:38:08 -06:00
YPOQ
7e740208f9 Makes bot emagging more consistent (#34274) 2018-01-11 21:34:44 -06:00
AnturK
7f9d721a72 Fixes mobs on lavaland targeting through walls on wakeup (#34280) 2018-01-11 21:33:34 -06:00
PKPenguin321
145cc8a822 Makes cyborg module damage visible to anyone nearby (#34287)
* swaps to_chats with visilbe_messages in damage feedback

* adds an actual alarm sound
2018-01-11 21:32:24 -06:00
Jordan Brown
edfa926886 Move a definition to the right file (#34288) 2018-01-11 21:31:13 -06:00
LetterJay
c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817
[MIRROR] [READY]Pulling claw 2
2018-01-11 15:19:11 -06:00
LetterJay
878b16e41a Merge pull request #4757 from Citadel-Station-13/upstream-merge-34177
[MIRROR] Prevents renaming uniquely named pets.
2018-01-11 15:16:38 -06:00
oranges
b128c9d3b5 Merge pull request #34117 from ShizCalev/medbot-tweak
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
2018-01-11 14:07:28 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-11 14:03:52 -06:00
Leo
5cb74c909c Merge pull request #34177 from ShizCalev/pet-rename
Prevents renaming uniquely named pets.
2018-01-11 07:40:33 -06:00
Leo
bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime
Corrects runtime when shooting humans
2018-01-11 07:40:26 -06:00
deathride58
ff83b6451b Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065
[MIRROR] Fixes reflections
2018-01-10 20:21:56 +00:00
deathride58
54c87fdd15 Merge pull request #4738 from Citadel-Station-13/upstream-merge-34111
[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
2018-01-10 19:58:18 +00:00
deathride58
14d0857109 Merge pull request #4733 from Citadel-Station-13/upstream-merge-34187
[MIRROR] Switches butchering/gib drops to use drop_location
2018-01-10 19:56:54 +00:00
deathride58
d0e170d9f9 Merge pull request #4731 from Citadel-Station-13/upstream-merge-34169
[MIRROR] Fixes fully_heal not curing disabilities
2018-01-10 19:56:13 +00:00
deathride58
7c576c7d32 Merge pull request #4728 from Citadel-Station-13/upstream-merge-33933
[MIRROR] Late joiners also get summoned guns/magic
2018-01-10 19:50:33 +00:00
ShizCalev
594de23c1f Fixes buckled message spam for ghosts inside talking scythes (#34111)
* Fixes buckled message spam for ghosts

* params
2018-01-10 03:48:10 -06:00
Leo
88fa0ea83f Merge pull request #34195 from tgstation/Cyberboss-patch-1
Fixes weakref runtimes
2018-01-10 03:12:46 -06:00
Leo
5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation
Switches butchering/gib drops to use drop_location
2018-01-10 03:12:39 -06:00
Leo
377ea0f68c Merge pull request #34169 from ShizCalev/heal-fix
Fixes fully_heal not curing disabilities
2018-01-10 03:12:23 -06:00
oranges
3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining
Late joiners also get summoned guns/magic
2018-01-10 03:11:56 -06:00
Robustin
34919f7bce Fixes reflections 2018-01-10 03:11:48 -06:00
deathride58
78df6facb6 fixes flavortext readmores for real this time 2018-01-09 22:59:22 -05:00