Commit Graph

4488 Commits

Author SHA1 Message Date
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
deathride58
071235d790 Update uplink.dm 2018-01-14 18:01:56 -05:00
oranges
ef200d44c5 Added tooltips to roundend traitor purchase logs 2018-01-14 16:43:11 -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
deathride58
6162d812f4 Merge pull request #4825 from Citadel-Station-13/upstream-merge-34123
[MIRROR] Moves GLOB.movement_keys into SSinput and adds movement direction badminry
2018-01-14 20:42:40 +00:00
deathride58
96ffb89fc1 Merge pull request #4823 from Citadel-Station-13/message-visibility
Fixes message visibility for vorish play
2018-01-14 20:42:13 +00:00
Emmett Gaines
e27346812f Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123)
* badmin flip dirs

* moves movement_keys into SSinput from GLOB
2018-01-14 13:39:01 -06: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
7498bae414 Re-adds AK-47s button
ستالين هو أعظم

You're welcome.
2018-01-14 04:18:17 -06:00
Poojawa
655067471a Fixes *wag for mammals
Someone forgot that we have snowflake bodyparts.
2018-01-14 03:50:26 -06:00
LetterJay
703275c86f Merge pull request #4803 from Citadel-Station-13/upstream-merge-34276
[MIRROR] Update TGS API to 3.2.0.2
2018-01-14 03:12:31 -06:00
deathride58
9332db5bb0 Fixes character slot changing runtiming 2018-01-13 23:08:50 -05: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
257ee69202 Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360
[MIRROR] Fixes clownborg sprays not recharging
2018-01-13 20:29:01 +00:00
deathride58
c47008b123 Merge pull request #4808 from Citadel-Station-13/upstream-merge-34357
[MIRROR] Fix RPD runtimes and offsets of layered connector ports
2018-01-13 20:27:54 +00: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
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
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
9ccd21605d Merge pull request #4795 from Citadel-Station-13/pbchange
Panic bunker notice change
2018-01-13 20:21:43 +00:00
Leo
e8d21ac1f3 Merge pull request #34360 from kevinz000/patch-429
Fixes clownborg sprays not recharging
2018-01-13 13:25:24 -06:00
Leo
ba1f61cb9e Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime
Fix RPD runtimes and offsets of layered connector ports
2018-01-13 08:58:44 -06: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
oranges
9fe08da64a Merge pull request #34276 from Cyberboss/TGSAPI3202
Update TGS API to 3.2.0.2
2018-01-13 04:55:10 -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
LetterJay
6a9545db8a Panic bunker notice change 2018-01-12 23:22:36 -06:00
kevinz000
54b356a227 Fixes stimulum running out before the next breath (#34296) 2018-01-12 13:05:12 -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
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