Commit Graph

23833 Commits

Author SHA1 Message Date
oranges 387e09c08f Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-17 09:36:15 +13:00
oranges 073744fb19 Merge pull request #34322 from coiax/no-longer-harvested
Removes ash flora being harvested on roundstart
2018-01-17 09:35:23 +13:00
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 30dfc429dd Merge pull request #34473 from kevinz000/techwebs_points
Nerfs techweb cargo points
2018-01-17 09:29:25 +13:00
oranges 6cfede150c Merge pull request #34457 from AutomaticFrenzy/patch/air-status
Combine and fix Show Air Status and Air Status in Location
2018-01-17 09:28:52 +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
Jordan Brown fe0610f504 Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash
Fix Camera Failure crashing the server if there are no cameras
2018-01-16 09:38:56 -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
Jordan Brown e300843c44 Merge pull request #34479 from F-OS/patch-5
newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
2018-01-16 09:29:12 -05:00
Jordan Brown f1e7a3d070 Merge pull request #34455 from kevinz000/patch-435
Fixes shuttle console negative auths needed
2018-01-16 08:39:31 -05:00
Jordan Brown a3d3c93fa3 Merge pull request #34463 from DaedalusGame/micro_fix
Fixes duplicate reagents in chemistry macros
2018-01-16 08:39:06 -05:00
Jordan Brown 683402c5f7 Merge pull request #34460 from AnturK/whyijustwastedhalfanhourlookingforatypo
Fixes ChangeTurf runtimes in late loaded templates.
2018-01-16 08:38:27 -05:00
AnturK 332e7ca474 Makes getFlatIcon slower. (Also more precise) (#34199)
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
2018-01-16 08:32:35 -05:00
Tad Hardesty 66f5459e88 Fix Camera Failure crashing the server if there are no cameras 2018-01-15 21:12:06 -08:00
uraniummeltdown 8d5030f3a7 rename all 'clown' to 'bananium' for bananium mineral objects (#34462) 2018-01-15 23:02:18 -05:00
Tad Hardesty 5c85f18580 Combine and fix Show Air Status and Air Status in Location 2018-01-15 16:53:07 -08: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
F-OS 4d1cb3d01e we're reaching power creep levels that shouldn't even be possible 2018-01-15 12:24:02 -07:00
F-OS 75e1d31589 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>FIRE ALARM 2018-01-15 12:22:39 -07:00
AnturK 5872df6499 Fixes hardsuits in templates 2018-01-15 12:35:45 -06:00
kevinz000 a29994cbb1 Fixes Jaunters 2018-01-15 12:04:57 -06:00
kevinz000 4c527afda8 Nerfs techweb cargo points 2018-01-15 09:25:15 -08:00
Cyberboss 6fe468e3b4 Moves load_motd to config controller 2018-01-15 10:44:25 -05:00
Kyle Spier-Swenson 5bceb36588 Fixes compiler errors in the preload_rsc external resource thingy (#34061)
Fixes compiler errors in the preload_rsc external resource thingy
2018-01-15 10:32:20 -05:00
ShizCalev 18c0928903 Redundant params 2018-01-15 10:22:58 -05:00
Emmett Gaines 867a58d576 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 09:42:14 -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
WJohn fec56e4923 Remakes the space syndicate listening post. (#34309)
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
2018-01-15 14:17:04 +01:00
BordListian a196791f90 - Fixes duplicate reagents in chemistry macros 2018-01-15 13:39:15 +01:00
AnturK 8c514c1e82 Fixes ChangeTurf runtimes in late loaded templates. 2018-01-15 10:16:47 +01:00
ShizCalev 42df595372 Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 10:01:22 +01:00
coiax 978c2bd485 Various deadchat messages are more informative and consistent (#34326)
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
2018-01-15 09:55:54 +01:00
Iamgoofball 3dde1d253c The Express Console emag effect is now a proper emag effect (#34373)
* The Express Console emag effect is now a proper emag effect

cyka blyat

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm
2018-01-15 00:48:34 -05:00
kevinz000 34e134bd38 Fixes negative auth coutns 2018-01-14 20:53:27 -08: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
Leo 1572607f65 Merge pull request #34372 from YPOQ/slimestopfix
Fixes players not being immune to their own slime timestops
2018-01-15 01:35:39 -02:00
Leo dd109af292 Merge pull request #34384 from F-OS/patch-3
Quality of life: Newly constructed APCS are unlocked
2018-01-15 01:32:08 -02:00
oranges 723a183214 Merge pull request #34246 from Cruix/roundend_tooltips
Added tooltips to roundend traitor purchase logs
2018-01-15 11:42:40 +13:00
Tlaltecuhtli 8e2d8fd9fe sfds (#34392) 2018-01-14 16:41:42 -05:00
Emmett Gaines d040afd6d0 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 20:37:59 +01: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 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