Commit Graph

23780 Commits

Author SHA1 Message Date
Leo 28801ac5db Merge pull request #34360 from kevinz000/patch-429
Fixes clownborg sprays not recharging
2018-01-13 17:25:07 -02:00
Leo 13a5745fe7 Merge pull request #34358 from ShizCalev/nest-pet-collar
Cleans up a nesting level in pet attackby
2018-01-13 12:58:21 -02:00
Leo ac81f6aa91 Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime
Fix RPD runtimes and offsets of layered connector ports
2018-01-13 12:58:00 -02:00
Iamgoofball fc6580639c 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:53:44 -06:00
Leo e3e420c3e8 Merge pull request #34346 from AutomaticFrenzy/patch/slot-machine-icon
Fix slot machine design icon
2018-01-13 09:58:42 -02:00
oranges 7447a2f981 Merge pull request #34276 from Cyberboss/TGSAPI3202
Update TGS API to 3.2.0.2
2018-01-13 23:54:40 +13:00
Armhulen 83b7216e0a zzzzzz 2018-01-13 04:32:25 -06:00
Leo 3d0a04c392 Remove unnused random event 2018-01-13 04:31:08 -06:00
oranges 30ea4d1a38 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 23:21:58 +13:00
oranges 618f4dceab Merge pull request #33958 from XDTM/Morpheus
Dreaming Improvements
2018-01-13 23:21:08 +13:00
oranges 1448619b89 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 23:18:01 +13:00
kevinz000 ab85235c7b Fixes stimulum running out before the next breath (#34296) 2018-01-12 17:04:12 -02:00
Tad Hardesty 9f0022cb08 Fix slot machine design icon 2018-01-12 07:05:00 -08:00
kevinz000 aca01e3553 Update spray.dm 2018-01-12 06:37:37 -08:00
ShizCalev 7debf025d1 Cleans up a nesting level 2018-01-12 09:16:52 -05:00
Tad Hardesty 517ef9095a Fix RPD runtimes and offsets of layered connector ports 2018-01-12 06:08:10 -08:00
Leo 91e87c869c Merge pull request #34301 from kevinz000/patch-428
Harvesters now normally attack those with NODISMEMBER species
2018-01-12 11:05:18 -02:00
Leo 2fc16d51ed Merge pull request #34305 from AutomaticFrenzy/patch/debug-mapping
Add JMP buttons to mapping debug verbs
2018-01-12 11:04:16 -02:00
JJRcop 1b1287e009 Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 11:03:28 -02:00
Leo fae799a6d7 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar
Fix description of relabelled canisters
2018-01-12 11:02:46 -02:00
ShizCalev 90ed87fda6 Fixes pet collars not updating icons (#34184) 2018-01-12 13:16:45 +01:00
ExcessiveUseOfCobblestone 60acd24b71 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 22:37:41 -05:00
YPOQ 55ebe45700 Makes bot emagging more consistent (#34274) 2018-01-11 22:34:01 -05:00
AnturK e24d6ac847 Fixes mobs on lavaland targeting through walls on wakeup (#34280) 2018-01-11 22:32:46 -05:00
PKPenguin321 92988c8304 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 22:31:36 -05:00
Jordan Brown a5f70b3708 Move a definition to the right file (#34288) 2018-01-11 22:30:24 -05:00
kevinz000 9fb4370fa8 Adds logging and feedback messages to organ manipulations by admins (#34298)
* logging

* Update manipulate_organs.dm
2018-01-11 22:22:51 -05:00
kevinz000 73389f2be5 Fixes forensics runtimes (#34336) 2018-01-11 22:11:46 -05:00
Leo 1a03b8ac21 Merge pull request #34270 from tgstation/Cyberboss-patch-3
Fixes toolarm grammar
2018-01-11 21:11:52 -02:00
kevinz000 19322f10b9 Fixes vehicle action handling ordering (#34146)
* Fixes cleanup not working for vehicle actions

* Wrong ordering

* Update vehicle_actions.dm
2018-01-12 09:11:07 +13:00
kevinz000 f27948eaa3 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164)
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
2018-01-12 09:09:57 +13:00
oranges 6790f8e193 Merge pull request #34117 from ShizCalev/medbot-tweak
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
2018-01-12 09:06:45 +13:00
Tad Hardesty 827c4b3f99 Replace hardcoded z-level numbers with a trait system (#34090)
* Add basic structure of z-level traits

* Restore space transitions and add z-level debug verb

* Restore proper ruin spawning and transit level creation

* Replace station_z_levels and related checks with traits

* Eliminate more uses of ZLEVEL_{STATION_PRIMARY,LAVALAND}
2018-01-12 09:05:49 +13:00
arsserpentarium c86fc91b55 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-12 09:02:56 +13:00
oranges eb9180d7d6 Merge pull request #34204 from ShizCalev/chem-macro-feedback
improves chem macro feedback
2018-01-12 09:02:15 +13:00
Tad Hardesty 42886ff263 Fix description of relabelled canisters
And also fix name propriety of BZ canisters.
2018-01-11 05:21:19 -08:00
Jordan Brown ccbdb551bd Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 04:52:06 -05:00
AnturK f44c8bf694 Fixes potato cells missing wires (#34253) 2018-01-11 04:50:08 -05:00
Tad Hardesty 683c902383 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 04:36:33 -05:00
Tad Hardesty b9a620472a Add JMP buttons to mapping debug verbs 2018-01-10 21:57:15 -08:00
kevinz000 22c89a2390 Update constructs.dm 2018-01-10 19:22:49 -08:00
ExcessiveUseOfCobblestone 2b0aeec82e Adds Display Name Argument to Techweb Logging (#34216)
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
2018-01-10 15:57:33 -08:00
Leo ca84aa200b Merge pull request #34168 from ShizCalev/dna-human-runtime
Corrects runtime when shooting humans
2018-01-10 20:04:22 -02:00
Leo ce05906450 Merge pull request #34177 from ShizCalev/pet-rename
Prevents renaming uniquely named pets.
2018-01-10 20:03:43 -02:00
Leo 993e14e22e Merge pull request #34189 from ShizCalev/test-area-tick
CHECK_TICK & logging for cmd_admin_areatest
2018-01-10 20:03:01 -02:00
Leo 3d0813d01a Merge pull request #34203 from tortellinitony/asayf
Makes a hotkey for asay
2018-01-10 20:00:08 -02:00
Leo 7ccd0f2e9e Merge pull request #34219 from Cyberboss/RemoveSetBackground
Removes usage of set background
2018-01-10 19:53:23 -02:00
Leo 26d4e05d3d Merge pull request #34229 from Robustin/deconversionfix
Fixed cultists deconverting via holy water not giving a message
2018-01-10 19:46:01 -02:00
Leo 1aaf1e1c47 Merge pull request #34240 from Cyberboss/NewscasterFix
Fix newscaster href tokens
2018-01-10 19:44:21 -02:00
Jordan Brown 14a552cf51 Merge branch 'master' into RemoveSetBackground 2018-01-10 12:37:53 -08:00