Commit Graph

9911 Commits

Author SHA1 Message Date
oranges
7fe928d11a Merge pull request #34468 from ShizCalev/redundant-trim
Cleans up some redundant stripped_input usage
2018-01-17 09:32:00 +13:00
kevinz000
6ebc926f00 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-17 09:30:14 +13:00
oranges
31217df709 Merge pull request #34470 from Cyberboss/MoveMotd
Moves load_motd to config controller
2018-01-17 09:27:35 +13:00
F-OS
b0b74b6d97 Drone dispensers no longer trap the drones below them forcing ghosts to altclick (#34482)
* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* I've got PRs to close, no time to wait on you
2018-01-16 09:44:53 -05:00
kevinz000
df559566cb Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside. (#34171)
* Flash Refactor

* Update flash.dm

* Update flash.dm
2018-01-16 15:30:03 +01:00
XDTM
76b5ee3966 Xenobiology Species Rework (#34166)
I've always found grating that xenobiology had access to species they had no business working with, and slime magic can only explain so much. My idea is to separate those species into their respective departments/antags, instead of having them all into a centralized, cheap source.

    Androids should be made by robotics through augmentation
    Podpeople are a botany feature
    Skeletons should be limited to liches or other magic antags
    Zombies should stay limited to romerol
    Golems are still available in adamantine slimes (and luminescents can morph into golems with them)
    Shadowpeople still lack an official place, but luminescents can become shadowpeople with black cores

The basic races are mostly human and lizard, and there are mutation toxins for those in case someone wants their species back after bodyswapping/ling mutation sting/etc.
2018-01-16 11:07:06 +13:00
oranges
4e53bf5337 Merge pull request #34266 from KorPhaeron/goat
Goats eat plant people
2018-01-16 10:54:20 +13:00
Cyberboss
6fe468e3b4 Moves load_motd to config controller 2018-01-15 10:44:25 -05:00
ShizCalev
18c0928903 Redundant params 2018-01-15 10:22:58 -05:00
coiax
b288a4ae12 Xenomorph maids (and Barmaids) clean on move (#34354)
🆑 coiax
add: A xenomorph maid (or barmaid) cleans the floor as they walk on it.
Lie down, and they'll clean your face.
/🆑

- Clearly a massive xenobiology buff by letting them create simple mob
janitors.
- Actually implemented so the Barmaid can clean up the Emergency Escape
Bar, but sure, let's buff the regular maid as well.
2018-01-15 15:01:06 +01:00
John Ginnane
2587222509 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 23:04:18 -05:00
Tlaltecuhtli
529b794580 Fixes eating mouse grammar (#34395) 2018-01-14 23:01:30 -05:00
Tlaltecuhtli
8e2d8fd9fe sfds (#34392) 2018-01-14 16:41:42 -05:00
ShizCalev
3d08996463 Replaces cached get_area vars for names (#34338) 2018-01-13 21:55:47 -05:00
AnturK
618c03e2a6 Fixes mecha pilot speed. 2018-01-13 14:50:13 -06: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
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
Armhulen
83b7216e0a zzzzzz 2018-01-13 04:32:25 -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
ShizCalev
7debf025d1 Cleans up a nesting level 2018-01-12 09:16:52 -05: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
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
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
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
kevinz000
22c89a2390 Update constructs.dm 2018-01-10 19:22:49 -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
Jordan Brown
14a552cf51 Merge branch 'master' into RemoveSetBackground 2018-01-10 12:37:53 -08:00
KorPhaeron
c66ee9e069 Goats eat plant people 2018-01-10 11:31:34 -06:00
ShizCalev
b78951009b Fixes buckled message spam for ghosts inside talking scythes (#34111)
* Fixes buckled message spam for ghosts

* params
2018-01-10 10:46:56 +01:00
ShizCalev
868128bd6f Standardized and fixed ED209 2018-01-10 03:03:38 -05:00
Robustin
c906c17178 Fixes reflections (#34065)
File this under "how did nobody notice this shit for so long?" Currently reflections basically have the projectile pass through you like you're a piece of glass, which ruins one of its most important traitors (protecting people behind you/putting the shooter in danger.

Also energy shields are a meme and literally cannot block anything, instead of sparking a balance debate im just fixing the description so nobody gets duped.
2018-01-10 19:04:14 +13:00
oranges
41b06b0c31 Merge pull request #33933 from coiax/wizard-late-joining
Late joiners also get summoned guns/magic
2018-01-10 18:50:14 +13:00
Leo
cdffdf143e Merge pull request #34169 from ShizCalev/heal-fix
Fixes fully_heal not curing disabilities
2018-01-09 21:02:14 -02:00
Leo
981f3ef075 Merge pull request #34187 from ShizCalev/butcher-droplocation
Switches butchering/gib drops to use drop_location
2018-01-09 20:57:57 -02:00
Leo
a47adc94ee Merge pull request #34195 from tgstation/Cyberboss-patch-1
Fixes weakref runtimes
2018-01-09 20:56:43 -02:00
ShizCalev
7bdd8da5f9 honk 2018-01-09 15:42:20 -05:00
Jordan Brown
e13f2eef2a Removes usage of set background 2018-01-09 10:21:36 -05:00
AnturK
035bc592c4 Fixes teleport camera (#34113) 2018-01-08 23:08:45 -05:00
Jordan Brown
49885caed2 Fixes weakref runtimes 2018-01-08 15:25:52 -05:00
ShizCalev
9dd984d943 Switches butchering/gib drops to use drop_location 2018-01-08 03:20:22 -05:00
ShizCalev
1245c31955 Prevents renaming uniquely named pets. 2018-01-08 01:35:45 -05:00
oranges
c8ad5a6314 Clean up a bunch of undefined arg runtimes (#34105)
* Clean up a bunch of undefined arg runtimes

Ensure subtypes have the appropriate arguments, do a bit of code cleanup
and remove some uneeded emote procs that also caused runtimes

* Fix up all calls to canUseTopic, add the dexterity flag

* Runtime with missing force argument in borg unbuckle mob
2018-01-07 21:52:56 -05:00
Iamgoofball
c75d0f4ced Implements the Ballmer Peak: Now the bartender can help R&D! (#33979)
* Implements the Ballmer Peak: Now the bartender can help R&D!

* fugg

* lmao forgot to multiply that

* unzips math

* asdaafffff

* buffs windows ME

* Adds notifications about the peak.
2018-01-07 21:29:52 -05:00
John Ginnane
a480f74d03 Newly crafted stacks are merged with held stacks of the same type (#33971)
* Merge newly crafted stacks with held stacks

* Update code
2018-01-07 21:27:53 -05:00